Add Barbican password to deployment

In order to deploy with the new Barbican composable role, a password
must be generated and passed on deployment.

Change-Id: I091ecfbcb2e38fe77203244ac7a597aedcb558fb
This commit is contained in:
Juan Antonio Osorio Robles
2016-08-10 08:38:13 +03:00
parent e0c3c1fe0c
commit e842085935
4 changed files with 7 additions and 0 deletions

View File

@@ -46,6 +46,7 @@ class TestPasswordsUtil(TestCase):
mock.call('OVERCLOUD_ADMIN_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_ADMIN_TOKEN=PASSWORD\n'),
mock.call('OVERCLOUD_AODH_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_BARBICAN_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_CEILOMETER_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_CEILOMETER_SECRET=PASSWORD\n'),
mock.call('OVERCLOUD_CEPH_ADMIN_KEY=CEPHX_KEY\n'),
@@ -98,6 +99,7 @@ class TestPasswordsUtil(TestCase):
'OVERCLOUD_ADMIN_PASSWORD=PASSWORD\n',
'OVERCLOUD_ADMIN_TOKEN=PASSWORD\n',
'OVERCLOUD_AODH_PASSWORD=PASSWORD\n',
'OVERCLOUD_BARBICAN_PASSWORD=PASSWORD\n',
'OVERCLOUD_CEILOMETER_PASSWORD=PASSWORD\n',
'OVERCLOUD_CEILOMETER_SECRET=PASSWORD\n',
'OVERCLOUD_CEPH_ADMIN_KEY=CEPHX_KEY\n',

View File

@@ -144,6 +144,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'AdminPassword': 'password',
'AdminToken': 'password',
'AodhPassword': 'password',
'BarbicanPassword': 'password',
'CeilometerMeteringSecret': 'password',
'CeilometerPassword': 'password',
'CephAdminKey': 'password',
@@ -308,6 +309,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'AdminPassword': 'password',
'AdminToken': 'password',
'AodhPassword': 'password',
'BarbicanPassword': 'password',
'CeilometerMeteringSecret': 'password',
'CeilometerPassword': 'password',
'CephAdminKey': 'password',

View File

@@ -40,6 +40,7 @@ _PASSWORD_NAMES = (
"OVERCLOUD_ADMIN_PASSWORD",
"OVERCLOUD_ADMIN_TOKEN",
"OVERCLOUD_AODH_PASSWORD",
"OVERCLOUD_BARBICAN_PASSWORD",
"OVERCLOUD_CEILOMETER_PASSWORD",
"OVERCLOUD_CEILOMETER_SECRET",
"OVERCLOUD_CINDER_PASSWORD",

View File

@@ -70,6 +70,8 @@ class DeployOvercloud(command.Command):
parameters['AdminPassword'] = passwords['OVERCLOUD_ADMIN_PASSWORD']
parameters['AdminToken'] = passwords['OVERCLOUD_ADMIN_TOKEN']
parameters['AodhPassword'] = passwords['OVERCLOUD_AODH_PASSWORD']
parameters['BarbicanPassword'] = (
passwords['OVERCLOUD_BARBICAN_PASSWORD'])
parameters['CeilometerPassword'] = ceilometer_pass
parameters['CeilometerMeteringSecret'] = ceilometer_secret
parameters['CinderPassword'] = passwords[