summaryrefslogtreecommitdiffstats
path: root/mcp/patches/0016-Set-boot-source-selections.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-25 17:11:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-25 17:11:56 +0000
commit58615ef93be91652da9dcef3ac797d11c5cc7e88 (patch)
treef171de33c3e4d0dcd1830a0843c02c31b54a652c /mcp/patches/0016-Set-boot-source-selections.patch
parent996a8a8518d5e3baf72b7882112f4a15c184b5eb (diff)
parentdf66a22fa1007ed3f7cd3b3f0ea0a696a0d06bc3 (diff)
Merge "maas: boot-resources: Dynamic arch list from PDF" into stable/fraser
Diffstat (limited to 'mcp/patches/0016-Set-boot-source-selections.patch')
-rw-r--r--mcp/patches/0016-Set-boot-source-selections.patch2
1 files changed, 1 insertions, 1 deletions
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 }}"