x/browbeat
Code Issues Proposed changes

Shaker Enhancements

Browse Source 
Changes and improvements to Shaker
Upgrade shaker to 0.0.15 and shaker_dns_nameservers option to image build

Change-Id: I0b3cd8ed8c656e757c0e9bbbec64eebaa8de88e1
This commit is contained in:
Sai Sindhur Malleni 2016-08-25 09:40:25 -04:00
parent c0b769a351
commit ae326ff0e6
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/install/group_vars/all.yml
View File

@ -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

2
ansible/install/roles/browbeat/tasks/main.yml
View File

@ -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

2
ansible/install/shaker_build.yml
View File

@ -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

5
ci-scripts/config/tripleo/install-and-check/all.yml
View File

@ -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
#######################################