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 f027f3b..dd7c39a 100644 (file)
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -26,9 +26,6 @@ Parameters:
   RabbitPassword:
     Type: String
     NoEcho: true
-  NovaInterfaces:
-    Type: String
-    Default: eth0
   NovaComputeDriver:
     Type: String
     Default: libvirt.LibvirtDriver
@@ -128,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}
@@ -135,5 +134,3 @@ Resources:
       swift:
         store_user: ''
         store_key: ''
-      interfaces:
-        control: {Ref: NovaInterfaces}