diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-24 20:23:41 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-25 17:12:20 +0000 |
| commit | e29220a401a5ad0607453d6a82de9b61d1c02aca (patch) | |
| tree | b2f6946a0a47d3cc53af7d79f94d1c7c16b8f086 /mcp/patches | |
| parent | 58615ef93be91652da9dcef3ac797d11c5cc7e88 (diff) | |
[maas] Download only used subarches imagesopnfv-6.1.0
- reduce download size/time for MaaS images by downloading only the
subarch images we use;
- fix stop condition in MaaS artifact download script;
- stop importing images before updating the boot resources to prevent
race conditions;
Change-Id: I3b15fae3463bc6c54be2cc06e0cb31edcbd307cb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 7f797f1b5a9340d24d700879abca6b39413e7375)
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/0003-maas-region-force-artifact-download.patch | 2 | ||||
| -rw-r--r-- | mcp/patches/0016-Set-boot-source-selections.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch index c689881d8..50ef66aba 100644 --- a/mcp/patches/0003-maas-region-force-artifact-download.patch +++ b/mcp/patches/0003-maas-region-force-artifact-download.patch @@ -70,4 +70,4 @@ new file mode 100644 +wait_for 30 "maas opnfv boot-resources import" +wait_for 90 "! maas opnfv boot-resources is-importing | grep -q 'true'" +maas opnfv rack-controllers import-boot-images || exit 3 -+wait_for 30 "true {%- for arch in region.opnfv_arches %} && test -d /var/lib/maas/boot-resources/current/ubuntu/{{ arch }}{%- endfor %}" ++wait_for 30 "true {%- for arch in region.opnfv_arches.split(' ') %} && test -d /var/lib/maas/boot-resources/current/ubuntu/{{ arch }}{%- endfor %}" diff --git a/mcp/patches/0016-Set-boot-source-selections.patch b/mcp/patches/0016-Set-boot-source-selections.patch index ae7654c64..972810931 100644 --- a/mcp/patches/0016-Set-boot-source-selections.patch +++ b/mcp/patches/0016-Set-boot-source-selections.patch @@ -21,7 +21,7 @@ diff --git a/maas/region.sls b/maas/region.sls +boot_source_selections: + cmd.run: -+ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv boot-source-selection update 1 1 release='{{ region.maas_config.default_distro_series }}' {%- for arch in region.opnfv_arches.split(' ') %} arches='{{ arch }}' {%- endfor %}" ++ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv boot-resources stop-import && maas opnfv boot-source-selection update 1 1 release='{{ region.maas_config.default_distro_series }}' {%- for arch in region.opnfv_arches.split(' ') %} arches='{{ arch }}' subarches='generic' subarches='ga-16.04' subarches='hwe-16.04' {%- endfor %}" + - require: + - cmd: maas_login_admin + - unless: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv boot-source-selections read 1 | grep -q {{ region.maas_config.default_distro_series }}" |