diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml index 09335e81b..b6ae90755 100644 --- a/browbeat-complete.yaml +++ b/browbeat-complete.yaml @@ -212,6 +212,7 @@ shaker: sleep_before: 5 sleep_after: 5 venv: /home/stack/shaker-venv + shaker_region: regionOne scenarios: - name: l2-4-1 enabled: true diff --git a/browbeat-config.yaml b/browbeat-config.yaml index 44ee98bdd..af1a43db4 100644 --- a/browbeat-config.yaml +++ b/browbeat-config.yaml @@ -54,6 +54,7 @@ shaker: sleep_before: 5 sleep_after: 5 venv: /home/stack/shaker-venv + shaker_region: regionOne scenarios: - name: l2 enabled: true diff --git a/lib/Shaker.py b/lib/Shaker.py index 6650430bf..941f595c8 100644 --- a/lib/Shaker.py +++ b/lib/Shaker.py @@ -103,13 +103,14 @@ class Shaker: port_no = self.config['shaker']['port'] flavor = self.config['shaker']['flavor'] venv = self.config['shaker']['venv'] + shaker_region = self.config['shaker']['shaker_region'] timeout = self.config['shaker']['join_timeout'] cmd_1 = ("source {}/bin/activate; source /home/stack/overcloudrc").format(venv) cmd_2=("shaker --server-endpoint {0}:{1} --flavor-name {2} --scenario {3}" - " --os-region-name regionOne --agent-join-timeout {6}" + " --os-region-name {7} --agent-join-timeout {6}" " --report {4}/{5}.html --output {4}/{5}.json" " --debug > {4}/{5}.log 2>&1").format(server_endpoint, - port_no, flavor, filename, result_dir, test_name, timeout) + port_no, flavor, filename, result_dir, test_name, timeout, shaker_region) cmd = ("{}; {}").format(cmd_1, cmd_2) from_ts = int(time.time() * 1000) if 'sleep_before' in self.config['shaker']: