X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=overcloud-source.yaml;h=97c55df8f410f3ee3b87e6d3d4f2f10ea40e8f39;hb=445dda586391c1c9d293f55f216596889066a8a0;hp=b862b4d16ede27ab8298b113a4127e7d5063c3bd;hpb=4da722abd23d3f47a5b162b629b448c140460ce0;p=apex-tripleo-heat-templates.git

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index b862b4d1..97c55df8 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -11,6 +11,7 @@ Parameters:
     Default: unset
     Description: The keystone auth secret.
     Type: String
+    NoEcho: true
   CinderPassword:
     Default: unset
     Description: The password for the cinder service account, used by cinder-api.
@@ -186,17 +187,6 @@ Resources:
                  - networks
         service-password:
           Ref: GlancePassword
-      os-collect-config:
-        cfn:
-          access_key_id:
-            Ref: Key
-          path: notcomputeConfig.Metadata
-          secret_access_key:
-            Fn::GetAtt:
-            - Key
-            - SecretAccessKey
-          stack_name:
-            Ref: AWS::StackName
       heat:
         admin_password:
           Ref: HeatPassword
@@ -250,20 +240,6 @@ Resources:
               - Fn::GetAtt:
                 - notcompute
                 - networks
-      nova:
-        compute_driver: libvirt.LibvirtDriver
-        db: mysql://nova:unset@localhost/nova
-        host:
-          Fn::Select:
-            - 0
-            - Fn::Select:
-              - 'ctlplane'
-              - Fn::GetAtt:
-                - notcompute
-                - networks
-        metadata-proxy: true
-        service-password:
-          Ref: NovaPassword
       neutron:
         host:
           Fn::Select:
@@ -295,6 +271,33 @@ Resources:
         ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
         service-password:
           Ref: NeutronPassword
+      nova:
+        compute_driver: libvirt.LibvirtDriver
+        db: mysql://nova:unset@localhost/nova
+        default_floating_pool:
+          ext-net
+        host:
+          Fn::Select:
+            - 0
+            - Fn::Select:
+              - 'ctlplane'
+              - Fn::GetAtt:
+                - notcompute
+                - networks
+        metadata-proxy: true
+        service-password:
+          Ref: NovaPassword
+      os-collect-config:
+        cfn:
+          access_key_id:
+            Ref: Key
+          path: notcomputeConfig.Metadata
+          secret_access_key:
+            Fn::GetAtt:
+            - Key
+            - SecretAccessKey
+          stack_name:
+            Ref: AWS::StackName
       rabbit:
         host:
           Fn::Select: