Enable Manila Service
During an overcloud deploy, a Manila password and service endpoint should be created. Without these, the service isn't acessible for end-user use. Change-Id: Id49d4ba0cb63c5730573c52b4b952d37ebf6fe9e
This commit is contained in:
parent
4c93faedb1
commit
ee2c07560d
@ -41,14 +41,15 @@ class TestPasswordsUtil(TestCase):
|
|||||||
mock.call('OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n'),
|
mock.call('OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n'),
|
||||||
mock.call('OVERCLOUD_HEAT_PASSWORD=PASSWORD\n'),
|
mock.call('OVERCLOUD_HEAT_PASSWORD=PASSWORD\n'),
|
||||||
mock.call('OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n'),
|
mock.call('OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n'),
|
||||||
|
mock.call('OVERCLOUD_MANILA_PASSWORD=PASSWORD\n'),
|
||||||
mock.call('OVERCLOUD_NEUTRON_PASSWORD=PASSWORD\n'),
|
mock.call('OVERCLOUD_NEUTRON_PASSWORD=PASSWORD\n'),
|
||||||
mock.call('OVERCLOUD_NOVA_PASSWORD=PASSWORD\n'),
|
mock.call('OVERCLOUD_NOVA_PASSWORD=PASSWORD\n'),
|
||||||
mock.call('OVERCLOUD_SWIFT_HASH=PASSWORD\n'),
|
mock.call('OVERCLOUD_SWIFT_HASH=PASSWORD\n'),
|
||||||
mock.call('OVERCLOUD_SWIFT_PASSWORD=PASSWORD\n'),
|
mock.call('OVERCLOUD_SWIFT_PASSWORD=PASSWORD\n'),
|
||||||
])
|
])
|
||||||
self.assertEqual(generate_password_mock.call_count, 13)
|
self.assertEqual(generate_password_mock.call_count, 14)
|
||||||
|
|
||||||
self.assertEqual(len(passwords), 13)
|
self.assertEqual(len(passwords), 14)
|
||||||
|
|
||||||
@mock.patch("os.path.isfile", return_value=True)
|
@mock.patch("os.path.isfile", return_value=True)
|
||||||
@mock.patch("rdomanager_oscplugin.utils._generate_password",
|
@mock.patch("rdomanager_oscplugin.utils._generate_password",
|
||||||
@ -64,6 +65,7 @@ class TestPasswordsUtil(TestCase):
|
|||||||
'OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n',
|
'OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n',
|
||||||
'OVERCLOUD_HEAT_PASSWORD=PASSWORD\n',
|
'OVERCLOUD_HEAT_PASSWORD=PASSWORD\n',
|
||||||
'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n',
|
'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n',
|
||||||
|
'OVERCLOUD_MANILA_PASSWORD=PASSWORD\n',
|
||||||
'OVERCLOUD_NEUTRON_PASSWORD=PASSWORD\n',
|
'OVERCLOUD_NEUTRON_PASSWORD=PASSWORD\n',
|
||||||
'OVERCLOUD_NOVA_PASSWORD=PASSWORD\n',
|
'OVERCLOUD_NOVA_PASSWORD=PASSWORD\n',
|
||||||
'OVERCLOUD_SWIFT_HASH=PASSWORD\n',
|
'OVERCLOUD_SWIFT_HASH=PASSWORD\n',
|
||||||
@ -80,7 +82,7 @@ class TestPasswordsUtil(TestCase):
|
|||||||
mock_open().write.assert_not_called()
|
mock_open().write.assert_not_called()
|
||||||
generate_password_mock.assert_not_called()
|
generate_password_mock.assert_not_called()
|
||||||
|
|
||||||
self.assertEqual(len(passwords), 13)
|
self.assertEqual(len(passwords), 14)
|
||||||
|
|
||||||
|
|
||||||
class TestCheckHypervisorUtil(TestCase):
|
class TestCheckHypervisorUtil(TestCase):
|
||||||
|
@ -311,6 +311,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
|||||||
'Controller-1::NeutronMechanismDrivers': 'linuxbridge',
|
'Controller-1::NeutronMechanismDrivers': 'linuxbridge',
|
||||||
'Compute-1::NeutronMechanismDrivers': 'linuxbridge',
|
'Compute-1::NeutronMechanismDrivers': 'linuxbridge',
|
||||||
'Controller-1::NeutronDhcpAgentsPerNetwork': 3,
|
'Controller-1::NeutronDhcpAgentsPerNetwork': 3,
|
||||||
|
'Controller-1::ManilaPassword': 'password',
|
||||||
}
|
}
|
||||||
|
|
||||||
mock_heat_deploy.assert_called_with(
|
mock_heat_deploy.assert_called_with(
|
||||||
@ -420,6 +421,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
|||||||
'Compute-1::NeutronL3HA': True,
|
'Compute-1::NeutronL3HA': True,
|
||||||
'Compute-1::NeutronAllowL3AgentFailover': False,
|
'Compute-1::NeutronAllowL3AgentFailover': False,
|
||||||
'Controller-1::NeutronDhcpAgentsPerNetwork': 3,
|
'Controller-1::NeutronDhcpAgentsPerNetwork': 3,
|
||||||
|
'Controller-1::ManilaPassword': 'password',
|
||||||
}
|
}
|
||||||
|
|
||||||
mock_heat_deploy.assert_called_with(
|
mock_heat_deploy.assert_called_with(
|
||||||
|
@ -25,6 +25,7 @@ def generate_overcloud_passwords_mock():
|
|||||||
"OVERCLOUD_GLANCE_PASSWORD",
|
"OVERCLOUD_GLANCE_PASSWORD",
|
||||||
"OVERCLOUD_HEAT_PASSWORD",
|
"OVERCLOUD_HEAT_PASSWORD",
|
||||||
"OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",
|
"OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",
|
||||||
|
"OVERCLOUD_MANILA_PASSWORD",
|
||||||
"OVERCLOUD_NEUTRON_PASSWORD",
|
"OVERCLOUD_NEUTRON_PASSWORD",
|
||||||
"OVERCLOUD_NOVA_PASSWORD",
|
"OVERCLOUD_NOVA_PASSWORD",
|
||||||
"OVERCLOUD_SWIFT_HASH",
|
"OVERCLOUD_SWIFT_HASH",
|
||||||
|
@ -36,6 +36,7 @@ SERVICE_LIST = {
|
|||||||
'ec2': {},
|
'ec2': {},
|
||||||
'glance': {'password_field': 'OVERCLOUD_GLANCE_PASSWORD'},
|
'glance': {'password_field': 'OVERCLOUD_GLANCE_PASSWORD'},
|
||||||
'heat': {'password_field': 'OVERCLOUD_HEAT_PASSWORD'},
|
'heat': {'password_field': 'OVERCLOUD_HEAT_PASSWORD'},
|
||||||
|
'manila': {'password_field': 'OVERCLOUD_MANILA_PASSWORD'},
|
||||||
'neutron': {'password_field': 'OVERCLOUD_NEUTRON_PASSWORD'},
|
'neutron': {'password_field': 'OVERCLOUD_NEUTRON_PASSWORD'},
|
||||||
'nova': {'password_field': 'OVERCLOUD_NOVA_PASSWORD'},
|
'nova': {'password_field': 'OVERCLOUD_NOVA_PASSWORD'},
|
||||||
'novav3': {'password_field': 'OVERCLOUD_NOVA_PASSWORD'},
|
'novav3': {'password_field': 'OVERCLOUD_NOVA_PASSWORD'},
|
||||||
@ -81,6 +82,7 @@ def generate_overcloud_passwords(output_file="tripleo-overcloud-passwords"):
|
|||||||
"OVERCLOUD_GLANCE_PASSWORD",
|
"OVERCLOUD_GLANCE_PASSWORD",
|
||||||
"OVERCLOUD_HEAT_PASSWORD",
|
"OVERCLOUD_HEAT_PASSWORD",
|
||||||
"OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",
|
"OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",
|
||||||
|
"OVERCLOUD_MANILA_PASSWORD",
|
||||||
"OVERCLOUD_NEUTRON_PASSWORD",
|
"OVERCLOUD_NEUTRON_PASSWORD",
|
||||||
"OVERCLOUD_NOVA_PASSWORD",
|
"OVERCLOUD_NOVA_PASSWORD",
|
||||||
"OVERCLOUD_SWIFT_HASH",
|
"OVERCLOUD_SWIFT_HASH",
|
||||||
|
@ -52,6 +52,7 @@ PARAMETERS = {
|
|||||||
'GlancePassword': None,
|
'GlancePassword': None,
|
||||||
'HeatPassword': None,
|
'HeatPassword': None,
|
||||||
'HeatStackDomainAdminPassword': None,
|
'HeatStackDomainAdminPassword': None,
|
||||||
|
'ManilaPassword': None,
|
||||||
'NeutronControlPlaneID': None,
|
'NeutronControlPlaneID': None,
|
||||||
'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
|
'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
|
||||||
'NeutronPassword': None,
|
'NeutronPassword': None,
|
||||||
@ -114,6 +115,8 @@ class DeployOvercloud(command.Command):
|
|||||||
parameters['HeatPassword'] = passwords['OVERCLOUD_HEAT_PASSWORD']
|
parameters['HeatPassword'] = passwords['OVERCLOUD_HEAT_PASSWORD']
|
||||||
parameters['HeatStackDomainAdminPassword'] = passwords[
|
parameters['HeatStackDomainAdminPassword'] = passwords[
|
||||||
'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD']
|
'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD']
|
||||||
|
parameters['ManilaPassword'] = passwords[
|
||||||
|
'OVERCLOUD_MANILA_PASSWORD']
|
||||||
parameters['NeutronPassword'] = passwords[
|
parameters['NeutronPassword'] = passwords[
|
||||||
'OVERCLOUD_NEUTRON_PASSWORD']
|
'OVERCLOUD_NEUTRON_PASSWORD']
|
||||||
parameters['NovaPassword'] = passwords['OVERCLOUD_NOVA_PASSWORD']
|
parameters['NovaPassword'] = passwords['OVERCLOUD_NOVA_PASSWORD']
|
||||||
@ -150,6 +153,8 @@ class DeployOvercloud(command.Command):
|
|||||||
passwords['OVERCLOUD_HEAT_PASSWORD'])
|
passwords['OVERCLOUD_HEAT_PASSWORD'])
|
||||||
parameters['Controller-1::HeatStackDomainAdminPassword'] = (
|
parameters['Controller-1::HeatStackDomainAdminPassword'] = (
|
||||||
passwords['OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD'])
|
passwords['OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD'])
|
||||||
|
parameters['Controller-1::ManilaPassword'] = (
|
||||||
|
passwords['OVERCLOUD_MANILA_PASSWORD'])
|
||||||
parameters['Controller-1::NeutronPassword'] = (
|
parameters['Controller-1::NeutronPassword'] = (
|
||||||
passwords['OVERCLOUD_NEUTRON_PASSWORD'])
|
passwords['OVERCLOUD_NEUTRON_PASSWORD'])
|
||||||
parameters['Compute-1::NeutronPassword'] = (
|
parameters['Compute-1::NeutronPassword'] = (
|
||||||
|
Loading…
Reference in New Issue
Block a user