Finish correcting all OS::Nova::Server references

Some references to first_private_address were missed and some of the
Fn::Select calls were only half-completed.

Change-Id: I92a4e5e67784e5d64ec6e44ddcac55762cde81eb

diff --git a/nagios3.yaml b/nagios3.yaml
index 0bdb1d3..5c36329 100644 (file)
--- a/nagios3.yaml
+++ b/nagios3.yaml
@@ -96,5 +96,4 @@ Resources:
         Ref: Nagios3ImageId
       InstanceType: {Ref: InstanceType}
 Outputs:
-    Nagios3Host:
-        Fn::GetAtt: [ nagios3 , first_private_address ]
+    Nagios3Host: {'Fn::Select': [ 0, {'Fn::Select': [ 'ctlplane', 'Fn::GetAtt': [ 'nagios3' , 'networks' ] ]} ]}

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index ca8ff11..62f3b29 100644 (file)
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -114,9 +114,13 @@ Resources:
         ovs_db: {Ref: NeutronDSN}
         ovs:
           local_ip:
-            Fn::GetAtt:
-              - NovaCompute0
-              - first_private_address
+            Fn::Select:
+              - 0
+              - Fn::Select:
+                - ctlplane
+                - Fn::GetAtt:
+                  - NovaCompute0
+                  - networks
           tenant_network_type: {Ref: NeutronNetworkType}
           network_vlan_ranges: {Ref: NeutronNetworkVLANRanges}
           bridge_mappings: {Ref: NeutronBridgeMappings}

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 2c9213a..3298e69 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -176,10 +176,12 @@ Resources:
             - ''
             - - 'http://'
               - Fn::Select:
-                - 'ctlplane'
-                - Fn::GetAtt:
-                  - notcompute
-                  - networks
+                - 0
+                - Fn::Select:
+                  - 'ctlplane'
+                  - Fn::GetAtt:
+                    - notcompute
+                    - networks
               - ':8003'
         metadata_server_url:
           Fn::Join:
@@ -233,16 +235,24 @@ Resources:
           Ref: NovaPassword
       neutron:
         host:
-          Fn::GetAtt:
-            - notcompute
-            - first_private_address
+          Fn::Select:
+            - 0
+            - Fn::Select:
+              - ctlplane
+              - Fn::GetAtt:
+                - notcompute
+                - networks
         metadata_proxy_shared_secret: unset
         ovs:
           enable_tunneling: 'True'
           local_ip:
-            Fn::GetAtt:
-              - notcompute
-              - first_private_address
+            Fn::Select:
+              - 0
+              - Fn::Select:
+                - ctlplane
+                - Fn::GetAtt:
+                  - notcompute
+                  - networks
           public_interface: eth0
           physical_bridge: br-ex
           tenant_network_type: gre
@@ -251,9 +261,13 @@ Resources:
           Ref: NeutronPassword
       rabbit:
         host:
-          Fn::GetAtt:
-            - notcompute
-            - first_private_address
+          Fn::Select:
+            - 0
+            - Fn::Select:
+              - ctlplane
+              - Fn::GetAtt:
+                - notcompute
+                - networks
         password: guest
   notcompute:
     Type: OS::Nova::Server