commit 887ba2bfa4e93ba60142905859e048394e118472
author Matthew Mosesohn <mmosesohn@mirantis.com> Wed Aug 30 09:09:07 2017 +0300
committer Matthew Mosesohn <mmosesohn@mirantis.com> Wed Aug 30 13:31:58 2017 +0300
tree 5a71dd7cd03b1ddffde9d8b25d5f162b4acae47f
parent be9846966309c3e44388067465aa579519d514f8

Set docker bridge ip to avoid devcloud net overlap

Change-Id: I75be882df858fb87d54c568bd53d31c4b7615623

classes/cluster/k8s_aio_calico/kubernetes/compute.yml

diff --git a/classes/cluster/k8s_aio_calico/kubernetes/compute.yml b/classes/cluster/k8s_aio_calico/kubernetes/compute.yml
index 5559236..0190a19 100644
--- a/classes/cluster/k8s_aio_calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s_aio_calico/kubernetes/compute.yml
@@ -16,6 +16,8 @@
       pkgs:
         - docker-engine=1.12.6-0~ubuntu-xenial
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network:

classes/cluster/k8s_aio_contrail/kubernetes/compute.yml

diff --git a/classes/cluster/k8s_aio_contrail/kubernetes/compute.yml b/classes/cluster/k8s_aio_contrail/kubernetes/compute.yml
index 5fd2102..3ab2f0b 100644
--- a/classes/cluster/k8s_aio_contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s_aio_contrail/kubernetes/compute.yml
@@ -30,6 +30,8 @@
       pkgs:
         - docker-engine=1.12.6-0~ubuntu-xenial
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network:

classes/cluster/k8s_ha_calico/kubernetes/compute.yml

diff --git a/classes/cluster/k8s_ha_calico/kubernetes/compute.yml b/classes/cluster/k8s_ha_calico/kubernetes/compute.yml
index 1f43281..d1ffd64 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/compute.yml
@@ -16,6 +16,8 @@
       pkgs:
         - docker-engine=1.12.6-0~ubuntu-xenial
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network:

classes/cluster/k8s_ha_contrail/kubernetes/compute.yml

diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml b/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml
index 8a4855b..1424aec 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml
@@ -30,6 +30,8 @@
       pkgs:
         - docker-engine=1.12.6-0~ubuntu-xenial
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network:

classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 12e5170..1935ae4 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -29,6 +29,8 @@
       pkgs:
         - ${_param:kubernetes_docker_package}
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network: