aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-03-16 11:47:14 +0200
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-03-18 09:29:03 +0000
commit279376fe10d40471614822ddc0a5c151eb886863 (patch)
tree79b1fa98b7d833064bd9e588b5eabc20c432bc61
parentb0ba9e8e09d70cb5871a6f343a698e3b481ac297 (diff)
Remove default for the RabbitMQ password
Since the password is now autogenerated from the tripleoclient, there is no need to keep the default value here. Change-Id: If41cb56134966456f8590da04f392faffe5c62a1 Closes-Bug: #1557688
-rw-r--r--overcloud.yaml2
-rw-r--r--puppet/cinder-storage.yaml1
-rw-r--r--puppet/compute.yaml1
-rw-r--r--puppet/controller.yaml1
4 files changed, 0 insertions, 5 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index 0e986dab..5ad68913 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -278,13 +278,11 @@ parameters:
type: string
default: unset
description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
- # FIXME: 'guest' is provisioned in RabbitMQ by default, we should create a user if these are changed
RabbitUserName:
default: guest
description: The username for RabbitMQ
type: string
RabbitPassword:
- default: guest
description: The password for RabbitMQ
type: string
hidden: true
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 888f3cf8..878b31c2 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -51,7 +51,6 @@ parameters:
description: Name of an existing Nova key pair to enable SSH access to the instances
type: string
RabbitPassword:
- default: 'guest'
type: string
hidden: true
RabbitUserName:
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index ee5bced6..f5c848c8 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -251,7 +251,6 @@ parameters:
type: string
default: '' # Has to be here because of the ignored empty value bug
RabbitPassword:
- default: guest
description: The password for RabbitMQ
type: string
hidden: true
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index a873ce8a..3ff0639c 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -595,7 +595,6 @@ parameters:
default: '' # Has to be here because of the ignored empty value bug
hidden: true
RabbitPassword:
- default: guest
description: The password for RabbitMQ
type: string
hidden: true