Merge "Expose bridge_mappings in the overcloud."

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

diff --git a/nova-compute-group.yaml b/nova-compute-group.yaml
index 90e1bb0..9942028 100644 (file)
--- a/nova-compute-group.yaml
+++ b/nova-compute-group.yaml
@@ -17,12 +17,14 @@ Parameters:
   ServicePassword:
     Description: admin_password for setting up auth in nova.
     Type: String
-  QuantumHost:
+    NoEcho: true
+  NeutronHost:
     Type: String
   RabbitHost:
     Type: String
   RabbitPassword:
     Type: String
+    NoEcho: true
   NovaInterfaces:
     Type: String
     Default: eth0
@@ -35,10 +37,10 @@ Parameters:
     Type: String
   NovaComputeTemplate:
     Type: String
-    Default: https://raw.github.com/stackforge/tripleo-heat-templates/master/nova-compute-instance.yaml
+    Default: https://raw.github.com/openstack/tripleo-heat-templates/master/nova-compute-instance.yaml
   NovaDSN:
     Type: String
-  QuantumDSN:
+  NeutronDSN:
     Type: String
 Resources:
   NovaCompute0:
@@ -50,7 +52,7 @@ Resources:
         KeyName: {Ref: KeyName}
         KeystoneHost: {Ref: KeystoneHost}
         ServicePassword: {Ref: ServicePassword}
-        QuantumHost: {Ref: QuantumHost}
+        NeutronHost: {Ref: NeutronHost}
         RabbitHost: {Ref: RabbitHost}
         RabbitPassword: {Ref: RabbitPassword}
         NovaInterfaces: {Ref: NovaInterfaces}
@@ -58,5 +60,5 @@ Resources:
         NovaApiHost: {Ref: NovaApiHost}
         GlanceHost: {Ref: GlanceHost}
         NovaDSN: {Ref: NovaDSN}
-        QuantumDSN: {Ref: QuantumDSN}
+        NeutronDSN: {Ref: NeutronDSN}
       TemplateURL: {Ref: NovaComputeTemplate}