MaaS: Reduce C/D timeouts, minor fixes

- add new patch for maas.region, extending it poorly with a timeout
  override mechanism; the new comissioning/deploying timeout defaults
  (10/15min) will be used instead of MaaS defaults (20/40min), unless
  reclass params are defined with different values;
- add 30s delay between 'machine mark-broken' and 'machine mark-fixed'
  MaaS cli commands (fixes a rare race condition);
- fix forgotten replace in 'maas.pxe_route': s/opnfv_fuel_/opnfv_/g;

Change-Id: I71c562b80031bac2793dd470d52928c2d62e5300
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 01e94712d75c0a1cf7585f0ed380dd9a3967274e)

4 files changed, 50 insertions, 3 deletions

diff --git a/mcp/patches/0010-maas-region-allow-timeout-override.patch b/mcp/patches/0010-maas-region-allow-timeout-override.patch
new file mode 100644
index 000000000..5b68b4350
--- /dev/null
+++ b/mcp/patches/0010-maas-region-allow-timeout-override.patch
@@ -0,0 +1,46 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sat, 23 Sep 2017 02:03:01 +0200
+Subject: [PATCH] maas: region: allow timeout override
+
+Poor implementation that allows overiding comissioning/deploying
+timeouts, which are hardcoded in MaaS source code.
+
+Add the following reclass _param:
+- opnfv_maas_timeout_comissioning;
+- opnfv_maas_timeout_deploying;
+
+The defaults are now 10/15 minutes (MaaS defaults to 20/40 min).
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+
+diff --git a/maas/region.sls b/maas/region.sls
+--- a/maas/region.sls
++++ b/maas/region.sls
+@@ -19,6 +19,26 @@
+   - require:
+     - pkg: maas_region_packages
+
++maas_timeout_commissioning:
++  file.replace:
++    - name: "/usr/lib/python3/dist-packages/maasserver/node_status.py"
++    - pattern: '^(\s+NODE_STATUS.COMMISSIONING:)\s+\d+,$'
++    - repl: \1 {{ salt['pillar.get']('_param:opnfv_maas_timeout_comissioning', '10') }},
++    - require:
++      - pkg: maas_region_packages
++    - require_in:
++      - service: maas_region_services
++
++maas_timeout_deploying:
++  file.replace:
++    - name: "/usr/lib/python3/dist-packages/maasserver/node_status.py"
++    - pattern: '^(\s+NODE_STATUS.DEPLOYING:)\s+\d+,$'
++    - repl: \1 {{ salt['pillar.get']('_param:opnfv_maas_timeout_deploying', '15') }},
++    - require:
++      - pkg: maas_region_packages
++    - require_in:
++      - service: maas_region_services
++
+ {%- if region.get('enable_iframe', False)  %}
+
+ /etc/apache2/conf-enabled/maas-http.conf:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index f65daab6c..4140adb67 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -7,3 +7,4 @@
 /usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch
 /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch
 /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
+/usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
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') }}