Add addons and docker params.
* Added parameters for addons and docker version
for k8s_ha_contrail model.
Change-Id: I4b4ddd2b49f6d6bb7d3ac4de8f353a6448a22c4b
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 1006f1b..f57d1ab 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -28,7 +28,7 @@
docker:
host:
pkgs:
- - docker-engine=1.12.6-0~ubuntu-xenial
+ - ${_param:kubernetes_docker_package}
- python-docker
options:
bip: 172.31.255.1/24
@@ -50,5 +50,13 @@
contrail_cni:
image: ${_param:kubernetes_opencontrail_cni_image}
common:
+ addons:
+ virtlet:
+ enabled: ${_param:kubernetes_virtlet_enabled}
+ namespace: ${_param:kubernetes_addon_namespace}
+ image: ${_param:kubernetes_virtlet_image}
+ hosts:
+ - ${_param:kubernetes_compute_node01_hostname}
+ - ${_param:kubernetes_compute_node02_hostname}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 4776b3b..67b7254 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -25,12 +25,18 @@
kubernetes:
common:
addons:
+ dashboard:
+ enabled: ${_param:kubernetes_dashboard}
+ helm:
+ enabled: ${_param:kubernetes_helm_enabled}
netchecker:
- enabled: true
+ enabled: ${_param:kubernetes_netchecker_enabled}
agent_image: ${_param:kubernetes_netchecker_agent_image}
server_image: ${_param:kubernetes_netchecker_server_image}
- helm:
- enabled: true
+ contrail_network_controller:
+ namespace: ${_param:kubernetes_addon_namespace}
+ enabled: {_param:kubernetes_contrail_network_controller}
+ image: ${_param:kubernetes_contrail_network_controller_image}
master:
etcd:
ssl:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 9a7f189..2abddda 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -15,14 +15,30 @@
kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
+ # docker package version
+ kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
+
# component docker images
kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
+
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.3-1
- kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
- kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
+ kubernetes_virtlet_image: mirantis/virtlet:latest
+ kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
+ kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
+ kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
+
+ # switches of addons
+ kubernetes_addon_namespace: kube-system
+ kubernetes_dashboard: false
+ kubernetes_helm_enabled: true
+ kubernetes_netchecker_enabled: true
+ kubernetes_calico_policy_enabled: false
+ kubernetes_virtlet_enabled: false
+ kubernetes_contrail_network_controller: true
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1