diff options
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml | 6 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml | 6 | ||||
| m--------- | mcp/scripts/pharos | 0 |
3 files changed, 2 insertions, 10 deletions
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 962f5b779..d8064fa4a 100644 --- 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 7a7b90e1e..88b131f9c 100644 --- 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 -Subproject c1fab72890ba215217d706401ba13328a8e179c +Subproject 77b600ef0d64210c1b5fd72581cfe7752fa00c8 |