openstack/openstack-ansible
Code Issues Proposed changes

Add variable for cirros url

Browse Source 
Specify cirros url in one variable and reference that rather than
specifying the cirros url 4 times.

Change-Id: Ieabe855820d7f770912420d48dcceb28d260da44
Closes-Bug: #1489078
This commit is contained in:
Hugh Saunders 2015-08-26 18:04:13 +01:00 committed by Kevin Carter
parent 14dcfcf5d0
commit c7245cd606
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
playbooks/roles/os_tempest/defaults/main.yml
View File

@ -90,14 +90,17 @@ tempest_pip_packages:
- python-subunit
- junitxml
# Please update SHA in tempest_images below when changing the cirros version.
cirros_version: 0.3.4
cirros_tgz_url: "http://download.cirros-cloud.net/{{ cirros_version }}/cirros-{{ cirros_version }}-x86_64-uec.tar.gz"
cirros_img_url: "{{ cirros_tgz_url|replace('uec.tar.gz','disk.img') }}"
tempest_image_dir: "/opt/images"
tempest_images:
- url: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz"
- url: "{{ cirros_tgz_url }}"
sha256: "95e77c7deaf0f515f959ffe329918d5dd23e417503d1d45e926a888853c90710"
name: "cirros-0.3.4-x86_64-uec.tar.gz"
- url: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
- url: "{{ cirros_img_url }}"
sha256: "34987d0d5702f8813f3ff9efe90e9e39e6926ec78658763580a79face67f3394"
name: "cirros-0.3.4-x86_64-disk.img"
tempest_enable_instance_password: True
tempest_pip_instructions: "--isolated"

2
playbooks/roles/os_tempest/tasks/tempest_resources.yml
View File

@ -18,7 +18,7 @@
command: 'image-create'
openrc_path: /root/openrc
image_name: cirros
image_url: 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img'
image_url: "{{ cirros_img_url }}"
image_container_format: bare
image_disk_format: qcow2
image_is_public: True

19
playbooks/roles/os_tempest/templates/tempest.conf.j2
View File

@ -17,14 +17,13 @@ allow_tenant_isolation = True
[boto]
aki_manifest = cirros-{{ cirros_version }}-x86_64-vmlinuz.manifest.xml
ami_manifest = cirros-{{ cirros_version }}-x86_64-blank.img.manifest.xml
ari_manifest = cirros-{{ cirros_version }}-x86_64-initrd.manifest.xml
ec2_url = {{ tempest_boto_ec2_url }}
s3_url = {{ tempest_boto_s3_url }}
s3_materials_path = /opt/images/s3-materials/cirros-0.3.4
ari_manifest = cirros-0.3.4-x86_64-initrd.manifest.xml
ami_manifest = cirros-0.3.4-x86_64-blank.img.manifest.xml
ari_manifest = cirros-0.3.4-x86_64-initrd.manifest.xml
aki_manifest = cirros-0.3.4-x86_64-vmlinuz.manifest.xml
instance_type = tempest1
s3_materials_path = /opt/images/s3-materials/cirros-{{ cirros_version }}
[cli]
@ -107,7 +106,7 @@ trust = false
[image]
endpoint_type = internalURL
http_image = http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz
http_image = {{ cirros_tgz_url }}
[image-feature-enabled]
@ -160,11 +159,11 @@ lock_path = {{ tempest_git_dest }}/locks
[scenario]
aki_img_file = cirros-{{ cirros_version }}-x86_64-vmlinuz
ari_img_file = cirros-{{ cirros_version }}-x86_64-initrd
ami_img_file = cirros-{{ cirros_version }}-x86_64-blank.img
img_dir = {{ tempest_image_dir }}
img_file = cirros-0.3.4-x86_64-disk.img
ami_img_file = cirros-0.3.4-x86_64-blank.img
ari_img_file = cirros-0.3.4-x86_64-initrd
aki_img_file = cirros-0.3.4-x86_64-vmlinuz
img_file = cirros-{{ cirros_version }}-x86_64-disk.img
ssh_user = {{ tempest_compute_image_ssh_user }}