summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2017-10-02 13:15:12 +0000
committerRyota Mibu <r-mibu@cq.jp.nec.com>2017-10-02 15:07:29 +0000
commit94d05da570a6c2f6be987ef9af8b05c66672cf56 (patch)
treea199dbc8f2273cbbf791481f08285cde63228d6f
parent6799dee0b48647e5c45fa9341d88822636895259 (diff)
fix referring neutron option in inspector
Change-Id: I01173cdf301f168edebfc2ec6df82b015adebca7 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com> (cherry picked from commit 1bec48cd10057821828ffca3f5ecf31b853c66f7)
-rw-r--r--doctor_tests/inspector/sample.py6
-rw-r--r--etc/doctor.sample.conf2
2 files changed, 4 insertions, 4 deletions
diff --git a/doctor_tests/inspector/sample.py b/doctor_tests/inspector/sample.py
index fcdb48fe..54328727 100644
--- a/doctor_tests/inspector/sample.py
+++ b/doctor_tests/inspector/sample.py
@@ -35,7 +35,7 @@ class SampleInspector(BaseInspector):
auth = get_identity_auth(project=self.conf.doctor_project)
session = get_session(auth=auth)
- if self.conf.update_neutron_port_dp_status:
+ if self.conf.inspector.update_neutron_port_dp_status:
self.neutron = neutron_client(session)
self.servers = collections.defaultdict(list)
@@ -95,11 +95,11 @@ class SampleInspector(BaseInspector):
self.hostnames.append(hostname)
thr1 = self._disable_compute_host(hostname)
thr2 = self._vms_reset_state('error', hostname)
- if self.conf.update_neutron_port_dp_status:
+ if self.conf.inspector.update_neutron_port_dp_status:
thr3 = self._set_ports_data_plane_status('DOWN', hostname)
thr1.join()
thr2.join()
- if self.conf.update_neutron_port_dp_status:
+ if self.conf.inspector.update_neutron_port_dp_status:
thr3.join()
@utils.run_async
diff --git a/etc/doctor.sample.conf b/etc/doctor.sample.conf
index 56fc8281..6eeea3a5 100644
--- a/etc/doctor.sample.conf
+++ b/etc/doctor.sample.conf
@@ -37,7 +37,6 @@
#type = local
#ip = 127.0.0.1
#username = root
-#update_neutron_port_dp_status = False
[monitor]
#type = sample
@@ -46,6 +45,7 @@
#type = sample
#ip = 127.0.0.1
#port = 12345
+#update_neutron_port_dp_status = False
[consumer]
#type = sample