performa
/
os-faults
Code Issues Proposed changes

Skip monitoring nodes in TcpCloud 

Change-Id: Ia15a4b286466b974c36c1170e4a06351bebbc2f9
This commit is contained in:
Anton Studenov 2016-12-14 15:29:57 +03:00
parent c7004ea52c
commit d36e9fb103
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_faults/drivers/tcpcloud.py
View File

@ -249,7 +249,7 @@ class TCPCloudManagement(cloud_management.CloudManagement):
# get all nodes except salt master (that has cfg* hostname) by default
self.slave_name_regexp = cloud_management_params.get(
'slave_name_regexp', '^(?!cfg)')
'slave_name_regexp', '^(?!cfg|mon)')
self.cached_cloud_hosts = list()
self.fqdn_to_hosts = dict()

4
os_faults/tests/unit/drivers/test_tcpcloud.py
View File

@ -45,7 +45,7 @@ class TCPCloudManagementTestCase(test.TestCase):
'slave_iface': 'eth1',
}
self.get_nodes_cmd = (
"salt -E '^(?!cfg)' network.interfaces --out=yaml")
"salt -E '^(?!cfg|mon)' network.interfaces --out=yaml")
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
@ddt.data((
@ -210,7 +210,7 @@ class TcpServiceTestCase(test.TestCase):
'username': 'root',
}
self.get_nodes_cmd = (
"salt -E '^(?!cfg)' network.interfaces --out=yaml")
"salt -E '^(?!cfg|mon)' network.interfaces --out=yaml")
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
@ddt.data(*tcpcloud.TCPCloudManagement.SERVICE_NAME_TO_CLASS.items())