| commit | 1abc83c1ae9b002d1be1b5b5f21d6759111d8f98 | [log] [tgz] |
|---|---|---|
| author | Svimba <psvimbersky@mirantis.com> | Thu Jun 14 10:14:36 2018 +0200 |
| committer | Svimba <psvimbersky@mirantis.com> | Thu Jun 14 10:14:48 2018 +0200 |
| tree | d8a738e0ddd5adb1f472b655e8b6a45e7c2e994e | |
| parent | 196759928f9f251f9b8afe49fc06b52a3bd99304 [diff] |
Change docker version for K8s+OC4 Change-Id: I0cc24c0f090db341f57e938c44d9dff41f2ffbc3
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml index 8aa48ea..bd0ebb7 100644 --- a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml +++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
@@ -29,9 +29,6 @@ - ens4 docker: host: - pkgs: - - ${_param:kubernetes_docker_package} - - python-docker options: bip: 172.31.255.1/24 kubernetes:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml index a408bbf..957235b 100644 --- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml +++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -40,6 +40,10 @@ engine: docker_hybrid ssl: enabled: true + docker: + host: + options: + bip: 172.31.255.1/24 kubernetes: pool: kubelet:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml index 2e19967..7932ac2 100644 --- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml +++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -20,9 +20,6 @@ kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq - # docker package version - kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial - # component docker images kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11 kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11