From ae326ff0e642bf3e5774fac1a471ec927e304d26 Mon Sep 17 00:00:00 2001 From: Sai Sindhur Malleni Date: Thu, 25 Aug 2016 09:40:25 -0400 Subject: [PATCH] Shaker Enhancements Changes and improvements to Shaker Upgrade shaker to 0.0.15 and shaker_dns_nameservers option to image build Change-Id: I0b3cd8ed8c656e757c0e9bbbec64eebaa8de88e1 --- ansible/install/group_vars/all.yml | 6 +++++- ansible/install/roles/browbeat/tasks/main.yml | 2 +- ansible/install/shaker_build.yml | 2 +- ci-scripts/config/tripleo/install-and-check/all.yml | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml index 730b1076e..50219a9ff 100644 --- a/ansible/install/group_vars/all.yml +++ b/ansible/install/group_vars/all.yml @@ -34,6 +34,9 @@ rally_version: 0.5.0 # The default Shaker venv shaker_venv: /home/stack/shaker-venv +# Shaker version to Install +shaker_version: 0.0.15 + # The default PerfKit venv: perfkit_venv: /home/stack/perfkit-venv @@ -112,8 +115,9 @@ shaker_port: 5555 # Should choose m1.small or larger shaker_flavor: m1.small # Shaker centos image builder template -shaker_centos: "{{shaker_venv}}/lib/python2.7/site-packages/shaker/resources/image_builder_templates/centos.yaml" +shaker_image: "{{shaker_venv}}/lib/python2.7/site-packages/shaker/resources/image_builder_templates/centos.yaml" shaker_region: regionOne +shaker_dns_nameserver: "{{ dns_server }}" ####################################### # Connman Configuration diff --git a/ansible/install/roles/browbeat/tasks/main.yml b/ansible/install/roles/browbeat/tasks/main.yml index 6041c7a4e..0e7498e1f 100644 --- a/ansible/install/roles/browbeat/tasks/main.yml +++ b/ansible/install/roles/browbeat/tasks/main.yml @@ -133,7 +133,7 @@ shell: . {{ rally_venv }}/bin/activate; . {{ overcloudrc }}; rally deployment create --fromenv --name overcloud - name: Install shaker - pip: name=pyshaker version=0.0.14 virtualenv={{ shaker_venv }} + pip: name=pyshaker version={{ shaker_version }} virtualenv={{ shaker_venv }} # # Serve results out of httpd if browbeat_results_in_httpd is set to true diff --git a/ansible/install/shaker_build.yml b/ansible/install/shaker_build.yml index 2d2bb9ba8..927eac16d 100644 --- a/ansible/install/shaker_build.yml +++ b/ansible/install/shaker_build.yml @@ -10,7 +10,7 @@ shell: > source {{ overcloudrc }}; source {{ shaker_venv }}/bin/activate; shaker-image-builder --flavor-name {{ shaker_flavor }} --image-builder-template - {{ shaker_centos }} --os-region-name {{ shaker_region }} + {{ shaker_image }} --dns-nameservers {{ shaker_dns_nameserver }} --os-region-name {{ shaker_region }} become: true register: image_result failed_when: image_result.rc != 0 diff --git a/ci-scripts/config/tripleo/install-and-check/all.yml b/ci-scripts/config/tripleo/install-and-check/all.yml index f53492a35..ee7f9c176 100644 --- a/ci-scripts/config/tripleo/install-and-check/all.yml +++ b/ci-scripts/config/tripleo/install-and-check/all.yml @@ -34,6 +34,9 @@ rally_version: 0.5.0 # The default Shaker venv shaker_venv: /home/stack/shaker-venv +# Shaker version to install +shaker_version: 0.0.15 + # The default PerfKit venv: perfkit_venv: /home/stack/perfkit-venv @@ -112,7 +115,7 @@ shaker_port: 5555 # Should choose m1.small or larger shaker_flavor: m1.small # Shaker centos image builder template, change this back to centos once outside of nested virt (jkilpatr) -shaker_centos: "{{shaker_venv}}/lib/python2.7/site-packages/shaker/resources/image_builder_templates/debian.yaml" +shaker_image: "{{shaker_venv}}/lib/python2.7/site-packages/shaker/resources/image_builder_templates/debian.yaml" shaker_region: regionOne #######################################