diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-08-11 22:29:16 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-08-16 14:36:47 +0000 |
| commit | 80e82be09b2354fe21f51784542973bb479c6364 (patch) | |
| tree | dfa014721e04cd2025200c6124127aa81a4ed750 /puppet/cinder-storage.yaml | |
| parent | 248068bd97a9159623f226aa74c9b3ea775346a3 (diff) | |
Remove deprecated net_ip_uri_map output
Takes the net_ip_uri_map value from the *_uri values emitted
by net_ip_map instead.
Also removes TenantIp and TenantIpUri from net_vip_map_external
templates as there won't be any VIP on the tenant network.
Change-Id: Icdac3d58162891f5ca3d5c20f14fcdff1781996f
Diffstat (limited to 'puppet/cinder-storage.yaml')
| -rw-r--r-- | puppet/cinder-storage.yaml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index de9a3009..0bde8aca 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -242,7 +242,14 @@ resources: str_replace: template: "'IP'" params: - IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} + IP: + get_attr: + - NetIpMap + - net_ip_map + - str_replace: + template: "NETWORK_uri" + params: + NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]} enable_package_install: {get_param: EnablePackageInstall} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} @@ -277,7 +284,6 @@ resources: network: mapped_data: net_ip_map: {get_attr: [NetIpMap, net_ip_map]} - net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]} volume_extraconfig: mapped_data: {get_param: BlockStorageExtraConfig} extraconfig: |