X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcontroller.yaml;h=9b362a85c2863222d9c3787a11ec921fb9e765c4;hb=bc00cf7e99e68b61450234de1ecfb4aa96aec174;hp=4086fe4e92e5f1c1e975c4b557887e67b2492bdc;hpb=19e44d2a61d31982b76e3ac9d0e8bb90f9ca57e1;p=apex-tripleo-heat-templates.git

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 4086fe4e..9b362a85 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -21,7 +21,6 @@ parameters:
     type: string
     default: ''
   AodhPassword:
-    default: unset
     description: The password for the aodh services.
     type: string
     hidden: true
@@ -1249,7 +1248,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]}]}