diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-03-24 16:23:08 +0100 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-03-24 16:43:37 +0100 |
| commit | 992f85b94842abf038c20c21550a3138bea47d85 (patch) | |
| tree | 740c70775977e8fff726b6bc5b28f9587e2bd60e /puppet | |
| parent | 1697dc1a54ed8daa43e346bd563de9ae9a051710 (diff) | |
Add quotes around the cinder_iscsi_ip_address value
In I783e939ae304385674909bfd9f1cac95e04cef22 we add brackets around
the cinder_iscsi_ip_address if IPv6 but that causes hiera to try
mapping the value into an array, while it isn't. This change adds
quotes around the brackets.
Change-Id: Id9bb4b12542f1943e9df702486d68424539c7a59
Closes-Bug: 1560934
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/cinder-storage.yaml | 6 | ||||
| -rw-r--r-- | puppet/controller.yaml | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index 878b31c2..b5694802 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -285,7 +285,11 @@ resources: size: {get_param: CinderLVMLoopDeviceSize} cinder_enable_iscsi_backend: {get_param: CinderEnableIscsiBackend} cinder_iscsi_helper: {get_param: CinderISCSIHelper} - cinder_iscsi_ip_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} + cinder_iscsi_ip_address: + str_replace: + template: "'IP'" + params: + IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 2e01c0cf..edcfc0a7 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1240,7 +1240,11 @@ resources: - '/sahara' swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]} swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} - cinder_iscsi_network: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} + cinder_iscsi_network: + str_replace: + template: "'IP'" + params: + IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} cinder_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]} glance_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]} glance_registry_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]} |