Merge "Disable MongoDB cluster security"

This commit is contained in:
Jenkins 2015-09-10 21:44:04 +00:00 committed by Gerrit Code Review
commit 87112905ed
2 changed files with 8 additions and 6 deletions

View File

@ -325,9 +325,10 @@ class MongoDBApp(object):
# Store the cluster member authentication key.
self.store_key(key_value)
self.configuration_manager.apply_system_override(
{'security.clusterAuthMode': 'keyFile',
'security.keyFile': self.get_key_file()}, CNF_CLUSTER)
# TODO(mvandijk): enable cluster security once Trove features are in
# self.configuration_manager.apply_system_override(
# {'security.clusterAuthMode': 'keyFile',
# 'security.keyFile': self.get_key_file()}, CNF_CLUSTER)
def _configure_network(self, port=None):
"""Make the service accessible at a given (or default if not) port.

View File

@ -176,9 +176,10 @@ class GuestAgentMongoDBClusterManagerTest(trove_testtools.TestCase):
def test_configure_cluster_security(self, get_key_mock, store_key_mock):
self.manager.app._configure_cluster_security('key')
store_key_mock.assert_called_once_with('key')
self.conf_mgr.apply_system_override.assert_called_once_with(
{'security.clusterAuthMode': 'keyFile',
'security.keyFile': '/var/keypath'}, 'clustering')
# TODO(mvandijk): enable cluster security once Trove features are in
# self.conf_mgr.apply_system_override.assert_called_once_with(
# {'security.clusterAuthMode': 'keyFile',
# 'security.keyFile': '/var/keypath'}, 'clustering')
@mock.patch.object(netutils, 'get_my_ipv4', return_value="10.0.0.2")
def test_configure_network(self, ip_mock):