summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorRhys Oxenham <roxenham@redhat.com>2016-03-31 00:08:17 +0100
committerRhys Oxenham <roxenham@redhat.com>2016-03-31 00:08:17 +0100
commitb90311442ded1a9f21a160fc57e1e210a240df7f (patch)
treed9aaa12641b199a6febc6eec8e2d8b8020776ae7 /environments
parentcccb984eb76febfedfe7118e27d3d82f31a224e2 (diff)
Updates ControlPlaneSubnetCidr to be a string
Heat is unable to execute the following join when creating the os-net-config definition (OsNetConfigImpl): addresses: - ip_netmask: list_join: - '/' - - {get_param: ControlPlaneIp} - {get_param: ControlPlaneSubnetCidr} In the default network-environment.yaml environment file the ControlPlaneSubnetCidr is defaulted as a non-string "24", e.g. ControlPlaneSubnetCidr: 24 Resulting in the following error, upon deploymnet: 2016-03-30 22:44:17 [overcloud-Controller-wazxxjc6dq22-2-2ictqfdx2nuo]: CREATE_FAILED Resource CREATE failed: resources.NetworkConfig: Property error: resources.OsNetConfigImpl.properties.config: Items to join must be strings not 24 This patch simply updates the default value to '24', to match other templates. This allows a deployment to succeed as expected. Change-Id: I5f75b02dba5c35a9856c6ceff9cf6c24a0cb56d8
Diffstat (limited to 'environments')
-rw-r--r--environments/network-environment.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/network-environment.yaml b/environments/network-environment.yaml
index 005310c7..9f2c667b 100644
--- a/environments/network-environment.yaml
+++ b/environments/network-environment.yaml
@@ -22,7 +22,7 @@ parameter_defaults:
TenantNetCidr: 172.16.0.0/24
ExternalNetCidr: 10.0.0.0/24
# CIDR subnet mask length for provisioning network
- ControlPlaneSubnetCidr: 24
+ ControlPlaneSubnetCidr: '24'
# Customize the IP ranges on each network to use for static IPs and VIPs
InternalApiAllocationPools: [{'start': '172.17.0.10', 'end': '172.17.0.200'}]
StorageAllocationPools: [{'start': '172.18.0.10', 'end': '172.18.0.200'}]