[baremetal] Allow MaaS timeouts to be set via IDF

Bump Pharos git submodule to pick up support for MaaS timeout
parameterization, as well as new IDF for lf-pod2.

Drop arch-specific MaaS timeouts, as they are now configurable
on a per-POD basis.

Sample usage (via IDF):

idf:
  fuel:
    maas:
      # MaaS timeouts (in minutes)
      timeout_comissioning: 10
      timeout_deploying: 15

Change-Id: I8fafa336b0bc64d705f6c2e40fc3dfb85672fb15
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml
index 962f5b7..d8064fa 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -15,7 +15,3 @@ parameters:
     opnfv_vm_secondary_interface: enp2s0
     opnfv_vm_tertiary_interface: enp3s0
     opnfv_vm_quaternary_interface: enp4s0
-
-    # MaaS timeouts
-    opnfv_maas_timeout_comissioning: 10
-    opnfv_maas_timeout_deploying: 20

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml
index 7a7b90e..88b131f 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -15,7 +15,3 @@ parameters:
     opnfv_vm_secondary_interface: ens3
     opnfv_vm_tertiary_interface: ens4
     opnfv_vm_quaternary_interface: ens5
-
-    # MaaS timeouts
-    opnfv_maas_timeout_comissioning: 10
-    opnfv_maas_timeout_deploying: 15

diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos
index c1fab72..77b600e 160000 (submodule)
--- a/mcp/scripts/pharos
+++ b/mcp/scripts/pharos
@@ -1 +1 @@
-Subproject commit c1fab72890ba215217d706401ba13328a8e179cd
+Subproject commit 77b600ef0d64210c1b5fd72581cfe7752fa00c8c