From 8baa6217dd8ed6540f9fa4052129c317756b7c26 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 15 Jun 2015 17:10:30 -0400 Subject: [PATCH] Default rabbitmq username/passwould should not be 'guest' Change-Id: I83c1a2f9fd3cb8c7c854a96c32ed18fcc818f15e Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1232025 --- instack_undercloud/undercloud.py | 8 ++++---- undercloud.conf.sample | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index e69566b63..37976e07c 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -204,12 +204,12 @@ _auth_opts = [ 'If left unset, one will be automatically generated.') ), cfg.StrOpt('undercloud_rabbit_password', - default='guest', - help='Rabbitmq password.' + help=('Rabbitmq password. ' + 'If left unset, one will be automatically generated.') ), cfg.StrOpt('undercloud_rabbit_username', - default='guest', - help='Rabbitmq username.' + help=('Rabbitmq username. ' + 'If left unset, one will be automatically generated.') ), cfg.StrOpt('undercloud_heat_stack_domain_admin_password', help=('Heat stack domain admin password. ' diff --git a/undercloud.conf.sample b/undercloud.conf.sample index cda2b0465..023cb2f58 100644 --- a/undercloud.conf.sample +++ b/undercloud.conf.sample @@ -127,11 +127,13 @@ # (string value) #undercloud_rabbit_cookie = -# Rabbitmq password. (string value) -#undercloud_rabbit_password = guest +# Rabbitmq password. If left unset, one will be automatically +# generated. (string value) +#undercloud_rabbit_password = -# Rabbitmq username. (string value) -#undercloud_rabbit_username = guest +# Rabbitmq username. If left unset, one will be automatically +# generated. (string value) +#undercloud_rabbit_username = # Heat stack domain admin password. If left unset, one will be # automatically generated. (string value)