Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"

[apex-tripleo-heat-templates.git] / cinder-storage.yaml

diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index 44f3b3b..7d44094 100644 (file)
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@@ -71,10 +71,10 @@ parameters:
     description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     type: string
   RabbitPassword:
-    default: ''
+    default: 'guest'
     type: string
   RabbitUserName:
-    default: ''
+    default: 'guest'
     type: string
   RabbitClientUseSSL:
     default: false
@@ -159,7 +159,7 @@ outputs:
   hosts_entry:
     value:
       str_replace:
-        template: "IP HOST HOST.novalocal"
+        template: "IP HOST"
         params:
           IP: {get_attr: [BlockStorage, networks, ctlplane, 0]}
           HOST: {get_attr: [BlockStorage, name]}