Take DOCKER_DEFAULT_ADDRESS_POOL parameter from heat temaplate
Change-Id: If66aa430fcee987ee46cfe9fd26cce5b717316fc
Related-Prod: PRODX-3456
diff --git a/de/heat-templates/fragments/SrvInstancesBM.yaml b/de/heat-templates/fragments/SrvInstancesBM.yaml
index 14876f5..842716e 100644
--- a/de/heat-templates/fragments/SrvInstancesBM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBM.yaml
@@ -48,6 +48,8 @@
type: string
docker_ucp_image:
type: string
+ docker_default_address_pool:
+ type: string
hardware_metadata:
description: The content of lab metadata.
default: ''
@@ -69,6 +71,7 @@
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
+ $docker_default_address_pool: { get_param: docker_default_address_pool }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
index bea8d12..b4c4995 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
@@ -59,6 +59,8 @@
default: ''
docker_ucp_image:
type: string
+ docker_default_address_pool:
+ type: string
public_net_id:
type: string
default: ''
@@ -86,6 +88,7 @@
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
+ $docker_default_address_pool: { get_param: docker_default_address_pool }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
index 8081dd8..f7aba6b 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
@@ -73,6 +73,8 @@
default: ''
docker_ucp_image:
type: string
+ docker_default_address_pool:
+ type: string
public_net_id:
type: string
default: ''
@@ -100,6 +102,7 @@
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
+ $docker_default_address_pool: { get_param: docker_default_address_pool }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
diff --git a/de/heat-templates/fragments/SrvInstancesVM.yaml b/de/heat-templates/fragments/SrvInstancesVM.yaml
index d62225a..563f76f 100644
--- a/de/heat-templates/fragments/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVM.yaml
@@ -48,6 +48,8 @@
docker_ucp_image:
type: string
default: 'docker/ucp:3.2.4'
+ docker_default_address_pool:
+ type: string
hardware_metadata:
description: The content of lab metadata.
default: ''
@@ -87,6 +89,7 @@
$private_floating_network_cidr: { get_param: private_floating_network_cidr }
$functions_override: { get_param: functions_override }
$docker_ucp_image: { get_param: docker_ucp_image }
+ $docker_default_address_pool: { get_param: docker_default_address_pool }
$single_node: { get_param: single_node }
inject_files:
diff --git a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
index de965d1..3d3f915 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
@@ -59,6 +59,8 @@
default: ''
docker_ucp_image:
type: string
+ docker_default_address_pool:
+ type: string
public_net_id:
type: string
docker_ee_release:
@@ -94,6 +96,7 @@
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
+ $docker_default_address_pool: { get_param: docker_default_address_pool }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
diff --git a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index fd68609..5cab539 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -73,6 +73,8 @@
default: ''
docker_ucp_image:
type: string
+ docker_default_address_pool:
+ type: string
public_net_id:
type: string
docker_ee_release:
@@ -114,6 +116,7 @@
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
+ $docker_default_address_pool: { get_param: docker_default_address_pool }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
diff --git a/de/heat-templates/fragments/multirack/CentralSite.yaml b/de/heat-templates/fragments/multirack/CentralSite.yaml
index ff05a71..79837d2 100644
--- a/de/heat-templates/fragments/multirack/CentralSite.yaml
+++ b/de/heat-templates/fragments/multirack/CentralSite.yaml
@@ -27,6 +27,8 @@
docker_ucp_image:
type: string
default: 'docker/ucp:3.2.4'
+ docker_default_address_pool:
+ type: string
worker_hardware_metadata:
description: The content of lab metadata.
default: ''
@@ -148,6 +150,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
node_type: "ucp"
key_name: { get_param: key_name }
image: { get_param: image }
@@ -175,6 +178,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
node_type: "worker"
key_name: { get_param: key_name }
image: { get_param: image }
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
index cf4983f..5c615c5 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
@@ -49,6 +49,8 @@
docker_ucp_image:
type: string
default: 'docker/ucp:3.2.4'
+ docker_default_address_pool:
+ type: string
hardware_metadata:
description: The content of lab metadata.
default: ''
@@ -77,6 +79,7 @@
$private_floating_network_cidr: { get_param: private_floating_network_cidr }
$functions_override: { get_param: functions_override }
$docker_ucp_image: { get_param: docker_ucp_image }
+ $docker_default_address_pool: { get_param: docker_default_address_pool }
inject_files:
type: "OS::Heat::CloudConfig"
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
index 79373ed..9333b08 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
@@ -48,6 +48,8 @@
docker_ucp_image:
type: string
default: 'docker/ucp:3.2.4'
+ docker_default_address_pool:
+ type: string
hardware_metadata:
description: The content of lab metadata.
default: ''
@@ -76,6 +78,7 @@
$private_floating_network_cidr: { get_param: private_floating_network_cidr }
$functions_override: { get_param: functions_override }
$docker_ucp_image: { get_param: docker_ucp_image }
+ $docker_default_address_pool: { get_param: docker_default_address_pool }
inject_files:
type: "OS::Heat::CloudConfig"
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
index a27610d..d361947 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
@@ -41,6 +41,8 @@
docker_ucp_image:
type: string
default: 'docker/ucp:3.2.4'
+ docker_default_address_pool:
+ type: string
hardware_metadata:
description: The content of lab metadata.
default: ''
@@ -65,6 +67,7 @@
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$docker_ucp_image: { get_param: docker_ucp_image }
+ $docker_default_address_pool: { get_param: docker_default_address_pool }
$functions_override: { get_param: functions_override }
inject_files:
diff --git a/de/heat-templates/multirack.yaml b/de/heat-templates/multirack.yaml
index 6886747..c5fdbee 100644
--- a/de/heat-templates/multirack.yaml
+++ b/de/heat-templates/multirack.yaml
@@ -103,6 +103,8 @@
docker_ucp_image:
type: string
default: 'docker/ucp:3.2.4'
+ docker_default_address_pool:
+ type: string
tunnel_interface:
type: string
default: ''
@@ -131,6 +133,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
key_name: { get_attr: [keypair_name, value] }
image: { get_param: image }
ucp_flavor: { get_param: ucp_flavor }
@@ -163,6 +166,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
key_name: { get_attr: [keypair_name, value] }
image: { get_param: image }
public_net_id: { get_param: public_net_id }
@@ -192,6 +196,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
key_name: { get_attr: [keypair_name, value] }
image: { get_param: image }
public_net_id: { get_param: public_net_id }
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 4746813..5450252 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -40,6 +40,7 @@
HUGE_PAGES=$huge_pages
TUNGSTENFABRIC_ENABLED=$tungstenfabric_enabled
SINGLE_NODE=$single_node
+DOCKER_DEFAULT_ADDRESS_POOL=$docker_default_address_pool
#
# End of block
#
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 0fd1cf4..757f689 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -22,6 +22,10 @@
type: string
description: IP address of vsrx in tungsten fabric data network
default: ''
+ docker_default_address_pool:
+ type: string
+ description: Default address pool for Docker ucp specific local networks
+ default: '10.10.1.0/16'
masters_size:
type: number
description: Number of masters instances to deploy
@@ -337,6 +341,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
node_type: "ucp"
key_name: { get_attr: [keypair_name, value] }
image: { get_param: image }
@@ -370,6 +375,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
@@ -399,6 +405,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
@@ -444,6 +451,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
@@ -489,6 +497,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
@@ -535,6 +544,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
@@ -573,6 +583,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
@@ -611,6 +622,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
@@ -656,6 +668,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
@@ -701,6 +714,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
@@ -739,6 +753,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ucp_image: { get_param: docker_ucp_image}
+ docker_default_address_pool: { get_param: docker_default_address_pool }
accessible_network: { get_attr: [accessible_network, public_network] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }