Disable nova bm file injection in undercloud

[apex-tripleo-heat-templates.git] / overcloud-source.yaml

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 8cb4596..97c55df 100644 (file)
--- 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.
@@ -57,6 +58,22 @@ Parameters:
     Default: stack
     Description: What username to ssh to the virtual power host with.
     Type: String
+  NeutronPublicInterface:
+    Default: eth0
+    Description: What interface to bridge onto br-ex for network nodes.
+    Type: String
+  NeutronPublicInterfaceDefaultRoute:
+    Default: ''
+    Description: A custom default route for the NeutronPublicInterface.
+    Type: String
+  NeutronPublicInterfaceIP:
+    Default: ''
+    Description: A custom IP address to put onto the NeutronPublicInterface.
+    Type: String
+  NeutronPublicInterfaceRawDevice:
+    Default: ''
+    Description: If set, the public interface is a vlan with this device as the raw device.
+    Type: String
   notcomputeImage:
     Type: String
     Default: overcloud-control
@@ -139,6 +156,9 @@ Resources:
         Ref: AdminPassword
       admin-token:
         Ref: AdminToken
+      bootstack:
+        public_interface_ip:
+          Ref: NeutronPublicInterfaceIP
       cinder:
         db: mysql://cinder:unset@localhost/cinder
         volume_size_mb: '5000'
@@ -167,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
@@ -231,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:
@@ -265,12 +260,44 @@ Resources:
                 - Fn::GetAtt:
                   - notcompute
                   - networks
-          public_interface: eth0
+          public_interface:
+            Ref: NeutronPublicInterface
+          public_interface_raw_device:
+            Ref: NeutronPublicInterfaceRawDevice
+          public_interface_route:
+            Ref: NeutronPublicInterfaceDefaultRoute
           physical_bridge: br-ex
           tenant_network_type: gre
         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: