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
This commit is contained in:
parent
fff5bdb1d4
commit
d00d2c41de
@ -340,12 +340,10 @@ statsd_enabled: False
|
|||||||
########################################
|
########################################
|
||||||
# Port for Shaker (5555 should suffice)
|
# Port for Shaker (5555 should suffice)
|
||||||
shaker_port: 5555
|
shaker_port: 5555
|
||||||
# Should choose m1.small or larger
|
# Base image for disk image builder
|
||||||
shaker_flavor: m1.small
|
shaker_image: centos7
|
||||||
# Shaker centos image builder template
|
|
||||||
shaker_image: "{{shaker_venv}}/lib/python2.7/site-packages/shaker/resources/image_builder_templates/centos.yaml"
|
|
||||||
shaker_region: regionOne
|
shaker_region: regionOne
|
||||||
shaker_dns_nameserver: "{{ dns_server }}"
|
|
||||||
|
|
||||||
#######################################
|
#######################################
|
||||||
# Connman Configuration
|
# Connman Configuration
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
- name: Build shaker image
|
- name: Build shaker image
|
||||||
shell: >
|
shell: >
|
||||||
source {{ overcloudrc }}; source {{ shaker_venv }}/bin/activate;
|
source {{ overcloudrc }}; source {{ shaker_venv }}/bin/activate;
|
||||||
shaker-image-builder --image-builder-mode dib --image-builder-distro centos7
|
shaker-image-builder --image-builder-mode dib --image-builder-distro
|
||||||
--os-region-name {{ shaker_region }}
|
{{shaker_image}} --os-region-name {{ shaker_region }}
|
||||||
register: image_result
|
register: image_result
|
||||||
failed_when: image_result.rc != 0
|
failed_when: image_result.rc != 0
|
||||||
|
Loading…
Reference in New Issue
Block a user