diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-26 19:25:21 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-26 17:59:31 +0000 |
| commit | e59133c6b910fee71f63855afcb2e39993de7bf8 (patch) | |
| tree | 9fa8ba7dbc234d9bdaa5420864d088ff230db2ed | |
| parent | 39c9a0bee27faf0313c79a58103704e94ac91ede (diff) | |
[maas] Make boot-source-selection ops idempotent
- add `unless` clause;
- instead of adding a new boot sources, update the existing one,
assuming standard MaaS installation (always updates id '1');
Change-Id: I2db92a3b14d0588095c69545cbb6977ca109613e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit d7ab894b988d8dd6fe49714e0d8d6077e08ebb16)
| -rw-r--r-- | mcp/patches/0016-Set-boot-source-selections.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mcp/patches/0016-Set-boot-source-selections.patch b/mcp/patches/0016-Set-boot-source-selections.patch index 73bdc90e9..ff52681d2 100644 --- a/mcp/patches/0016-Set-boot-source-selections.patch +++ b/mcp/patches/0016-Set-boot-source-selections.patch @@ -13,18 +13,18 @@ Subject: [PATCH] Set boot source selections Change-Id: I8dc738b3e6e6f1bfcc1348873f162651aff8bbdf diff --git a/maas/region.sls b/maas/region.sls -index 39844bd..e231795 100644 --- a/maas/region.sls +++ b/maas/region.sls -@@ -171,6 +171,12 @@ maas_login_admin: +@@ -171,6 +171,13 @@ maas_login_admin: cmd.run: - name: "maas-region apikey --username {{ region.admin.username }} > /var/lib/maas/.maas_credentials" +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-selections create 1 os='ubuntu' release='{{ region.maas_config.default_distro_series }}' arches='{{ pillar._param.opnfv_maas_node01_architecture.split('/')[0] }}' subarches='*' labels='*'" ++ - 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 }}'" + - 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 }}" + maas_force_artifact_sync: cmd.script: |