Browse Source

Merge "Always use the latest cirros image"

Zuul 3 months ago
parent
commit
f7678a3039
3 changed files with 15 additions and 58 deletions
  1. 2
    53
      lower-constraints.txt
  2. 12
    4
      playbooks/integration/cirros-image.yaml
  3. 1
    1
      requirements.txt

+ 2
- 53
lower-constraints.txt View File

@@ -1,65 +1,14 @@
1
-appdirs==1.4.3
2
-Babel==2.5.3
3
-certifi==2018.4.16
4
-chardet==3.0.4
5
-cliff==2.11.0
6
-cmd2==0.8.6
7 1
 coverage==4.0
8
-debtcollector==1.19.0
9
-decorator==4.3.0
10
-deprecation==2.0.2
11 2
 doc8==0.6.0
12
-docutils==0.14
13
-dogpile.cache==0.6.5
14
-extras==1.0.0
15 3
 fixtures==3.0.0
16 4
 flake8-import-order==0.13
17
-flake8==2.6.2
18 5
 hacking==1.0.0
19
-idna==2.6
20
-iso8601==0.1.12
21
-jmespath==0.9.3
22
-jsonpatch==1.23
23
-jsonpointer==2.0
24
-jsonschema==2.6.0
25
-keystoneauth1==3.7.0
26
-linecache2==1.0.0
27
-mccabe==0.5.3
28 6
 mock==2.0
29
-monotonic==1.5
30
-msgpack==0.5.6
31
-munch==2.3.2
32
-netaddr==0.7.19
33
-netifaces==0.10.7
34
-openstacksdk==0.11.0
35
-os-client-config==1.31.1
36
-os-service-types==1.2.0
37
-osc-lib==1.10.0
38
-oslo.i18n==3.20.0
39
-oslo.serialization==2.25.0
40
-oslo.utils==3.36.2
41
-packaging==17.1
7
+openstacksdk==0.17.0
42 8
 pbr==2.0.0
43
-prettytable==0.7.2
44
-pycodestyle==2.4.0
45
-pyflakes==1.2.3
46
-pyparsing==2.2.0
47
-pyperclip==1.6.1
48 9
 python-ironicclient==1.14.0
49
-python-mimeparse==1.6.0
50
-pytz==2018.4
51
-PyYAML==3.12
52
-reno==2.5.0
10
+Pygments==2.2.0
53 11
 requests==2.18.4
54
-requestsexceptions==1.4.0
55
-restructuredtext-lint==1.1.3
56
-simplejson==3.15.0
57 12
 six==1.10.0
58 13
 stestr==1.0.0
59
-stevedore==1.28.0
60 14
 testtools==2.2.0
61
-traceback2==1.4.0
62
-unittest2==1.1.0
63
-urllib3==1.22
64
-wcwidth==0.1.7
65
-wrapt==1.10.11

+ 12
- 4
playbooks/integration/cirros-image.yaml View File

@@ -1,11 +1,11 @@
1 1
 ---
2 2
 - name: Find Cirros UEC image
3
-  shell: openstack image list -f value -c Name | grep 'cirros-.*-uec$'
3
+  shell: openstack image list -f value -c Name | grep 'cirros-.*-uec$' | sort | tail -n1
4 4
   register: cirros_uec_image_result
5 5
   failed_when: cirros_uec_image_result.stdout == ""
6 6
 
7 7
 - name: Find Cirros disk image
8
-  shell: openstack image list -f value -c Name | grep 'cirros-.*-disk$'
8
+  shell: openstack image list -f value -c Name | grep 'cirros-.*-disk$' | sort | tail -n1
9 9
   register: cirros_disk_image_result
10 10
   failed_when: cirros_disk_image_result.stdout == ""
11 11
 
@@ -33,7 +33,15 @@
33 33
         creates: /opt/stack/data/ironic/httpboot/metalsmith
34 34
       become: yes
35 35
 
36
-    - name: Create MD5 checksums file for partition images
36
+    - name: Copy whole disk image
37
+      command: >
38
+        cp /opt/stack/devstack/files/{{ cirros_disk_image_result.stdout }}.img
39
+            /opt/stack/data/ironic/httpboot/metalsmith/
40
+      args:
41
+        creates: /opt/stack/data/ironic/httpboot/metalsmith/{{ cirros_disk_image_result.stdout }}.img
42
+      become: yes
43
+
44
+    - name: Create MD5 checksums file for images
37 45
       shell: md5sum cirros-* > CHECKSUMS
38 46
       args:
39 47
         chdir: /opt/stack/data/ironic/httpboot/metalsmith
@@ -61,7 +69,7 @@
61 69
         metalsmith_partition_kernel_image: "{{ baremetal_endpoint_result.stdout}}/metalsmith/{{ cirros_uec_image_result.stdout | replace('-uec', '-vmlinuz') }}"
62 70
         metalsmith_partition_ramdisk_image: "{{ baremetal_endpoint_result.stdout}}/metalsmith/{{ cirros_uec_image_result.stdout | replace('-uec', '-initrd') }}"
63 71
         metalsmith_partition_checksum: "{{ baremetal_endpoint_result.stdout}}/metalsmith/CHECKSUMS"
64
-        metalsmith_whole_disk_image: "{{ baremetal_endpoint_result.stdout}}/{{ cirros_disk_image_result.stdout }}.img"
72
+        metalsmith_whole_disk_image: "{{ baremetal_endpoint_result.stdout}}/metalsmith/{{ cirros_disk_image_result.stdout }}.img"
65 73
         metalsmith_whole_disk_checksum: "{{ cirros_disk_image_checksum_result.stdout }}"
66 74
 
67 75
   when: metalsmith_use_http | default(false)

+ 1
- 1
requirements.txt View File

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

Loading…
Cancel
Save