commit 243ee2eba93b98dc21d312a328e4351a2ad5c11f
author Ales Komarek <akomarek@mirantis.com> Thu Aug 31 06:44:45 2017 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> Thu Aug 31 06:44:47 2017 +0000
tree 54f50f0b15d7384f53f8193a0e3d2c0c072aeea7
parent 3114dacd9a689a238cde1390a78648c7cfd70bae
parent 5800719282a79ba92d4223b82e8f2e41a437451f

Merge "Adjustment of ironic multinode model"

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:

classes/system

diff --git a/classes/system b/classes/system
index 1b471d8..b30ffd8 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 1b471d810cc0a110d9720efb7d1a55c1e0bfd8dc
+Subproject commit b30ffd8f4b675aff251e9e851dd6267c4fe894b3