summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-23 21:46:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-23 21:46:57 +0000
commiteb06e7c953587d5448d7be1d703cac09aa23d8fc (patch)
tree7381a2a3aed72d17e69c174f356b6d21e04ef191 /mcp/salt-formulas
parenta6feb158fa5bc16b8d496c785c461c73ca715322 (diff)
parent01e94712d75c0a1cf7585f0ed380dd9a3967274e (diff)
Merge "MaaS: Reduce C/D timeouts, minor fixes"
Diffstat (limited to 'mcp/salt-formulas')
-rw-r--r--mcp/salt-formulas/maas/machines/mark_broken_fixed.sls2
-rw-r--r--mcp/salt-formulas/maas/pxe_route.sls4
2 files changed, 3 insertions, 3 deletions
diff --git a/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls b/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls
index 874718f6d..4829fb1d0 100644
--- a/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls
+++ b/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls
@@ -7,6 +7,6 @@ maas_login_admin:
# TODO: implement mark_broken_fixed_machine via _modules/maas.py
mark_broken_fixed_machine:
cmd.run:
- - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv machine mark-broken {{ pillar['system_id'] }} && maas opnfv machine mark-fixed {{ pillar['system_id'] }}"
+ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv machine mark-broken {{ pillar['system_id'] }} && sleep 30 && maas opnfv machine mark-fixed {{ pillar['system_id'] }}"
- require:
- cmd: maas_login_admin
diff --git a/mcp/salt-formulas/maas/pxe_route.sls b/mcp/salt-formulas/maas/pxe_route.sls
index 5f7cebdda..9c22b2a76 100644
--- a/mcp/salt-formulas/maas/pxe_route.sls
+++ b/mcp/salt-formulas/maas/pxe_route.sls
@@ -3,6 +3,6 @@ routes:
- name: {{ salt['pillar.get']('_param:opnfv_fn_vm_primary_interface') }}
- routes:
- name: maas_mcp_to_pxe_network
- ipaddr: {{ salt['pillar.get']('_param:opnfv_fuel_maas_pxe_network') }}
+ ipaddr: {{ salt['pillar.get']('_param:opnfv_maas_pxe_network') }}
netmask: 255.255.255.0
- gateway: {{ salt['pillar.get']('_param:opnfv_fuel_maas_mcp_address') }}
+ gateway: {{ salt['pillar.get']('_param:opnfv_maas_mcp_address') }}