Merge "Always use the latest cirros image"

This commit is contained in:
Zuul 2019-01-15 16:46:17 +00:00 committed by Gerrit Code Review
commit f7678a3039
3 changed files with 15 additions and 58 deletions

View File

@ -1,65 +1,14 @@
appdirs==1.4.3
Babel==2.5.3
certifi==2018.4.16
chardet==3.0.4
cliff==2.11.0
cmd2==0.8.6
coverage==4.0 coverage==4.0
debtcollector==1.19.0
decorator==4.3.0
deprecation==2.0.2
doc8==0.6.0 doc8==0.6.0
docutils==0.14
dogpile.cache==0.6.5
extras==1.0.0
fixtures==3.0.0 fixtures==3.0.0
flake8-import-order==0.13 flake8-import-order==0.13
flake8==2.6.2
hacking==1.0.0 hacking==1.0.0
idna==2.6
iso8601==0.1.12
jmespath==0.9.3
jsonpatch==1.23
jsonpointer==2.0
jsonschema==2.6.0
keystoneauth1==3.7.0
linecache2==1.0.0
mccabe==0.5.3
mock==2.0 mock==2.0
monotonic==1.5 openstacksdk==0.17.0
msgpack==0.5.6
munch==2.3.2
netaddr==0.7.19
netifaces==0.10.7
openstacksdk==0.11.0
os-client-config==1.31.1
os-service-types==1.2.0
osc-lib==1.10.0
oslo.i18n==3.20.0
oslo.serialization==2.25.0
oslo.utils==3.36.2
packaging==17.1
pbr==2.0.0 pbr==2.0.0
prettytable==0.7.2
pycodestyle==2.4.0
pyflakes==1.2.3
pyparsing==2.2.0
pyperclip==1.6.1
python-ironicclient==1.14.0 python-ironicclient==1.14.0
python-mimeparse==1.6.0 Pygments==2.2.0
pytz==2018.4
PyYAML==3.12
reno==2.5.0
requests==2.18.4 requests==2.18.4
requestsexceptions==1.4.0
restructuredtext-lint==1.1.3
simplejson==3.15.0
six==1.10.0 six==1.10.0
stestr==1.0.0 stestr==1.0.0
stevedore==1.28.0
testtools==2.2.0 testtools==2.2.0
traceback2==1.4.0
unittest2==1.1.0
urllib3==1.22
wcwidth==0.1.7
wrapt==1.10.11

View File

@ -1,11 +1,11 @@
--- ---
- name: Find Cirros UEC image - name: Find Cirros UEC image
shell: openstack image list -f value -c Name | grep 'cirros-.*-uec$' shell: openstack image list -f value -c Name | grep 'cirros-.*-uec$' | sort | tail -n1
register: cirros_uec_image_result register: cirros_uec_image_result
failed_when: cirros_uec_image_result.stdout == "" failed_when: cirros_uec_image_result.stdout == ""
- name: Find Cirros disk image - name: Find Cirros disk image
shell: openstack image list -f value -c Name | grep 'cirros-.*-disk$' shell: openstack image list -f value -c Name | grep 'cirros-.*-disk$' | sort | tail -n1
register: cirros_disk_image_result register: cirros_disk_image_result
failed_when: cirros_disk_image_result.stdout == "" failed_when: cirros_disk_image_result.stdout == ""
@ -33,7 +33,15 @@
creates: /opt/stack/data/ironic/httpboot/metalsmith creates: /opt/stack/data/ironic/httpboot/metalsmith
become: yes become: yes
- name: Create MD5 checksums file for partition images - name: Copy whole disk image
command: >
cp /opt/stack/devstack/files/{{ cirros_disk_image_result.stdout }}.img
/opt/stack/data/ironic/httpboot/metalsmith/
args:
creates: /opt/stack/data/ironic/httpboot/metalsmith/{{ cirros_disk_image_result.stdout }}.img
become: yes
- name: Create MD5 checksums file for images
shell: md5sum cirros-* > CHECKSUMS shell: md5sum cirros-* > CHECKSUMS
args: args:
chdir: /opt/stack/data/ironic/httpboot/metalsmith chdir: /opt/stack/data/ironic/httpboot/metalsmith
@ -61,7 +69,7 @@
metalsmith_partition_kernel_image: "{{ baremetal_endpoint_result.stdout}}/metalsmith/{{ cirros_uec_image_result.stdout | replace('-uec', '-vmlinuz') }}" metalsmith_partition_kernel_image: "{{ baremetal_endpoint_result.stdout}}/metalsmith/{{ cirros_uec_image_result.stdout | replace('-uec', '-vmlinuz') }}"
metalsmith_partition_ramdisk_image: "{{ baremetal_endpoint_result.stdout}}/metalsmith/{{ cirros_uec_image_result.stdout | replace('-uec', '-initrd') }}" metalsmith_partition_ramdisk_image: "{{ baremetal_endpoint_result.stdout}}/metalsmith/{{ cirros_uec_image_result.stdout | replace('-uec', '-initrd') }}"
metalsmith_partition_checksum: "{{ baremetal_endpoint_result.stdout}}/metalsmith/CHECKSUMS" metalsmith_partition_checksum: "{{ baremetal_endpoint_result.stdout}}/metalsmith/CHECKSUMS"
metalsmith_whole_disk_image: "{{ baremetal_endpoint_result.stdout}}/{{ cirros_disk_image_result.stdout }}.img" metalsmith_whole_disk_image: "{{ baremetal_endpoint_result.stdout}}/metalsmith/{{ cirros_disk_image_result.stdout }}.img"
metalsmith_whole_disk_checksum: "{{ cirros_disk_image_checksum_result.stdout }}" metalsmith_whole_disk_checksum: "{{ cirros_disk_image_checksum_result.stdout }}"
when: metalsmith_use_http | default(false) when: metalsmith_use_http | default(false)

View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0
openstacksdk>=0.11.0 # Apache-2.0 openstacksdk>=0.17.0 # Apache-2.0
python-ironicclient>=1.14.0 # Apache-2.0 python-ironicclient>=1.14.0 # Apache-2.0
requests>=2.18.4 # Apache-2.0 requests>=2.18.4 # Apache-2.0
six>=1.10.0 # MIT six>=1.10.0 # MIT