Disable nova bm file injection in undercloud

[apex-tripleo-heat-templates.git] / nova-compute-instance.yaml

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 62f3b29..dd7c39a 100644 (file)
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -5,6 +5,7 @@ Parameters:
     Default: unset
     Description: The password for the keystone admin account, used for monitoring, querying neutron etc.
     Type: String
+    NoEcho: true
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     Type: String
@@ -24,9 +25,7 @@ Parameters:
     Type: String
   RabbitPassword:
     Type: String
-  NovaInterfaces:
-    Type: String
-    Default: eth0
+    NoEcho: true
   NovaComputeDriver:
     Type: String
     Default: libvirt.LibvirtDriver
@@ -39,6 +38,7 @@ Parameters:
     Default: unset
     Description: The password for the nova service account, used by nova-api.
     Type: String
+    NoEcho: true
   GlanceHost:
     Type: String
   NovaDSN:
@@ -125,6 +125,8 @@ Resources:
           network_vlan_ranges: {Ref: NeutronNetworkVLANRanges}
           bridge_mappings: {Ref: NeutronBridgeMappings}
           enable_tunneling: {Ref: NeutronEnableTunnelling}
+        service-password:
+          Ref: NeutronPassword
       admin-password: {Ref: AdminPassword}
       rabbit:
         host: {Ref: RabbitHost}
@@ -132,5 +134,3 @@ Resources:
       swift:
         store_user: ''
         store_key: ''
-      interfaces:
-        control: {Ref: NovaInterfaces}