openstack/python-tripleoclient
Code Issues Proposed changes

Revert "Enable Manila Service"

Browse Source 
This reverts commit ee2c07560d.

Conflicts:
	rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py

Change-Id: Iba65d4b5245ea64bf79f01ce35a2c1b88e7c66f5
This commit is contained in:
Dougal Matthews 2015-08-10 15:19:47 +01:00
parent a3e3e674c3
commit 391bb83e7b
5 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rdomanager_oscplugin/tests/test_utils.py
View File

@ -41,15 +41,14 @@ class TestPasswordsUtil(TestCase):
mock.call('OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_HEAT_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_NOVA_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_SWIFT_HASH=PASSWORD\n'),
mock.call('OVERCLOUD_SWIFT_PASSWORD=PASSWORD\n'),
])
self.assertEqual(generate_password_mock.call_count, 14)
self.assertEqual(generate_password_mock.call_count, 13)
self.assertEqual(len(passwords), 14)
self.assertEqual(len(passwords), 13)
@mock.patch("os.path.isfile", return_value=True)
@mock.patch("rdomanager_oscplugin.utils._generate_password",
@ -65,7 +64,6 @@ class TestPasswordsUtil(TestCase):
'OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n',
'OVERCLOUD_HEAT_PASSWORD=PASSWORD\n',
'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n',
'OVERCLOUD_MANILA_PASSWORD=PASSWORD\n',
'OVERCLOUD_NEUTRON_PASSWORD=PASSWORD\n',
'OVERCLOUD_NOVA_PASSWORD=PASSWORD\n',
'OVERCLOUD_SWIFT_HASH=PASSWORD\n',
@ -82,7 +80,7 @@ class TestPasswordsUtil(TestCase):
mock_open().write.assert_not_called()
generate_password_mock.assert_not_called()
self.assertEqual(len(passwords), 14)
self.assertEqual(len(passwords), 13)
class TestCheckHypervisorUtil(TestCase):

5
rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -137,7 +137,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'HeatStackDomainAdminPassword': 'password',
'HypervisorNeutronPhysicalBridge': 'br-ex',
'HypervisorNeutronPublicInterface': 'nic1',
'ManilaPassword': 'password',
'NeutronAllowL3AgentFailover': False,
'NeutronBridgeMappings': 'datacentre:br-ex',
'NeutronControlPlaneID': 'network id',
@ -280,7 +279,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'HeatStackDomainAdminPassword': 'password',
'HypervisorNeutronPhysicalBridge': 'br-ex',
'HypervisorNeutronPublicInterface': 'nic1',
'ManilaPassword': 'password',
'NeutronAllowL3AgentFailover': False,
'NeutronBridgeMappings': 'datacentre:br-ex',
'NeutronControlPlaneID': 'network id',
@ -496,7 +494,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'Controller-1::GlancePassword': 'password',
'Controller-1::HeatPassword': 'password',
'Controller-1::HeatStackDomainAdminPassword': 'password',
'Controller-1::ManilaPassword': 'password',
'Controller-1::NeutronAllowL3AgentFailover': False,
'Controller-1::NeutronBridgeMappings': 'datacentre:br-test',
'Controller-1::NeutronDhcpAgentsPerNetwork': 3,
@ -603,7 +600,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'Controller-1::GlancePassword': 'password',
'Controller-1::HeatPassword': 'password',
'Controller-1::HeatStackDomainAdminPassword': 'password',
'Controller-1::ManilaPassword': 'password',
'Controller-1::NeutronAllowL3AgentFailover': False,
'Controller-1::NeutronBridgeMappings': 'datacentre:br-test',
'Controller-1::NeutronDhcpAgentsPerNetwork': 3,
@ -714,7 +710,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'Controller-1::GlancePassword': 'password',
'Controller-1::HeatPassword': 'password',
'Controller-1::HeatStackDomainAdminPassword': 'password',
'Controller-1::ManilaPassword': 'password',
'Controller-1::NeutronAllowL3AgentFailover': False,
'Controller-1::NeutronBridgeMappings': 'datacentre:br-test',
'Controller-1::NeutronDhcpAgentsPerNetwork': 3,

1
rdomanager_oscplugin/tests/v1/utils.py
View File

@ -25,7 +25,6 @@ def generate_overcloud_passwords_mock():
"OVERCLOUD_GLANCE_PASSWORD",
"OVERCLOUD_HEAT_PASSWORD",
"OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",
"OVERCLOUD_MANILA_PASSWORD",
"OVERCLOUD_NEUTRON_PASSWORD",
"OVERCLOUD_NOVA_PASSWORD",
"OVERCLOUD_SWIFT_HASH",

2
rdomanager_oscplugin/utils.py
View File

@ -35,7 +35,6 @@ SERVICE_LIST = {
'cinderv2': {'password_field': 'OVERCLOUD_CINDER_PASSWORD'},
'glance': {'password_field': 'OVERCLOUD_GLANCE_PASSWORD'},
'heat': {'password_field': 'OVERCLOUD_HEAT_PASSWORD'},
'manila': {'password_field': 'OVERCLOUD_MANILA_PASSWORD'},
'neutron': {'password_field': 'OVERCLOUD_NEUTRON_PASSWORD'},
'nova': {'password_field': 'OVERCLOUD_NOVA_PASSWORD'},
'novav3': {'password_field': 'OVERCLOUD_NOVA_PASSWORD'},
@ -81,7 +80,6 @@ def generate_overcloud_passwords(output_file="tripleo-overcloud-passwords"):
"OVERCLOUD_GLANCE_PASSWORD",
"OVERCLOUD_HEAT_PASSWORD",
"OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",
"OVERCLOUD_MANILA_PASSWORD",
"OVERCLOUD_NEUTRON_PASSWORD",
"OVERCLOUD_NOVA_PASSWORD",
"OVERCLOUD_SWIFT_HASH",

5
rdomanager_oscplugin/v1/overcloud_deploy.py
View File

@ -52,7 +52,6 @@ PARAMETERS = {
'GlancePassword': None,
'HeatPassword': None,
'HeatStackDomainAdminPassword': None,
'ManilaPassword': None,
'NeutronControlPlaneID': None,
'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
'NeutronPassword': None,
@ -118,8 +117,6 @@ class DeployOvercloud(command.Command):
parameters['HeatPassword'] = passwords['OVERCLOUD_HEAT_PASSWORD']
parameters['HeatStackDomainAdminPassword'] = passwords[
'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD']
parameters['ManilaPassword'] = passwords[
'OVERCLOUD_MANILA_PASSWORD']
parameters['NeutronPassword'] = passwords[
'OVERCLOUD_NEUTRON_PASSWORD']
parameters['NovaPassword'] = passwords['OVERCLOUD_NOVA_PASSWORD']
@ -156,8 +153,6 @@ class DeployOvercloud(command.Command):
passwords['OVERCLOUD_HEAT_PASSWORD'])
parameters['Controller-1::HeatStackDomainAdminPassword'] = (
passwords['OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD'])
parameters['Controller-1::ManilaPassword'] = (
passwords['OVERCLOUD_MANILA_PASSWORD'])
parameters['Controller-1::NeutronPassword'] = (
passwords['OVERCLOUD_NEUTRON_PASSWORD'])
parameters['Compute-1::NeutronPassword'] = (