diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-11 00:07:29 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-24 16:14:40 +0000 |
| commit | df66a22fa1007ed3f7cd3b3f0ea0a696a0d06bc3 (patch) | |
| tree | 8218bdadcfb26144272feed6692b85a8f6796392 /mcp/patches | |
| parent | b1f2be631eb5c2622beae350b992aa034885cd7c (diff) | |
maas: boot-resources: Dynamic arch list from PDF
Instead of leaving MaaS default to 'amd64', explicitly set the list
of architectures to support based on PDF data.
Change-Id: I852a3ce156db3df0c090f10c0b45c26058dbb6c6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit be45e3157fe19b8905e3a30f7f839a728a6c6df7)
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 b61a3d1b8..c689881d8 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 "test -d /var/lib/maas/boot-resources/current/ubuntu/amd64" ++wait_for 30 "true {%- for arch in region.opnfv_arches %} && 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 ff52681d2..ae7654c64 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 }}'" ++ - 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 %}" + - 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 }}" |