Updates ControlPlaneSubnetCidr to be a string
authorRhys Oxenham <roxenham@redhat.com>
Wed, 30 Mar 2016 23:08:17 +0000 (00:08 +0100)
committerRhys Oxenham <roxenham@redhat.com>
Wed, 30 Mar 2016 23:08:17 +0000 (00:08 +0100)
commitb90311442ded1a9f21a160fc57e1e210a240df7f
treed9aaa12641b199a6febc6eec8e2d8b8020776ae7
parentcccb984eb76febfedfe7118e27d3d82f31a224e2
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
environments/network-environment.yaml