summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-18 09:37:30 +0000
committerGerrit Code Review <review@openstack.org>2016-03-18 09:37:30 +0000
commit53e2f2dea7d6c7d3e623082141b6fedbc301c276 (patch)
treeee738ad88012711da236b46b3919bfa02165ec10
parentbf0f8d0f41262bf460aff10a7dafc905ea5fcab1 (diff)
parent279376fe10d40471614822ddc0a5c151eb886863 (diff)
Merge "Remove default for the RabbitMQ password"
-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 6a9e8720..14b70484 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