From d00d2c41de21d2f7e7fee33ceb75a30f0c1121a4 Mon Sep 17 00:00:00 2001 From: Sai Sindhur Malleni Date: Tue, 3 Oct 2017 11:01:30 -0400 Subject: [PATCH] Remove unused shaker vars & make img configurable This commit removes unused vars for shaker install. Some vars are not needed due to https://review.openstack.org/#/c/490967/. Also, this commit makes the image name configurable (user can choose between centos7 and ubuntu). Change-Id: I46114fb66064804cb4f00056eebe945a51270af6 --- ansible/install/group_vars/all.yml | 8 +++----- ansible/install/shaker_build.yml | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml index 1c746521c..3439346f8 100644 --- a/ansible/install/group_vars/all.yml +++ b/ansible/install/group_vars/all.yml @@ -340,12 +340,10 @@ statsd_enabled: False ######################################## # Port for Shaker (5555 should suffice) shaker_port: 5555 -# Should choose m1.small or larger -shaker_flavor: m1.small -# Shaker centos image builder template -shaker_image: "{{shaker_venv}}/lib/python2.7/site-packages/shaker/resources/image_builder_templates/centos.yaml" +# Base image for disk image builder +shaker_image: centos7 shaker_region: regionOne -shaker_dns_nameserver: "{{ dns_server }}" + ####################################### # Connman Configuration diff --git a/ansible/install/shaker_build.yml b/ansible/install/shaker_build.yml index f0a1e356e..5f5399d9d 100644 --- a/ansible/install/shaker_build.yml +++ b/ansible/install/shaker_build.yml @@ -19,7 +19,7 @@ - name: Build shaker image shell: > source {{ overcloudrc }}; source {{ shaker_venv }}/bin/activate; - shaker-image-builder --image-builder-mode dib --image-builder-distro centos7 - --os-region-name {{ shaker_region }} + shaker-image-builder --image-builder-mode dib --image-builder-distro + {{shaker_image}} --os-region-name {{ shaker_region }} register: image_result failed_when: image_result.rc != 0