Merge "[lab-config] Use Pharos submodule by default"

2 files changed, 0 insertions, 76 deletions

diff --git a/mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch b/mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch
deleted file mode 100644
index 27467dd61..000000000
--- a/mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 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
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 16 Dec 2017 21:14:35 +0100
-Subject: [PATCH] Update MaaS PXE config
-
-- reduce DHCP range to silence a dummy MaaS warning about address exhaustion;
-- define PXE/admin address for Salt Master node;
-- drop obsolete opnfv_infra_maas_pxe_address;
-
-JIRA: FUEL-316
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- config/installers/fuel/pod_config.yml.j2 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
-index 28c6188..f380535 100644
---- a/config/installers/fuel/pod_config.yml.j2
-+++ b/config/installers/fuel/pod_config.yml.j2
-@@ -40,6 +40,7 @@ parameters:
- {%- endif %}
-
-     opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }}
-+    opnfv_infra_config_pxe_address: {{ net_admin | ipaddr_index('2') }}
-     opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }}
-     opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }}
-     opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index('140') }}
-@@ -48,9 +49,8 @@ parameters:
-     opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }}
-
-     opnfv_infra_maas_pxe_network_address: {{ net_admin }}
--    opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index('3') }}
--    opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('5') }}
--    opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('250') }}
-+    opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('4') }}
-+    opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('100') }}
-
-     opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index('124') }}
-     opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index('125') }}
diff --git a/mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch b/mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch
deleted file mode 100644
index 346d7505c..000000000
--- a/mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 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
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 1 Jan 2018 17:06:59 +0100
-Subject: [PATCH] Add proxy node management network VIP
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- config/installers/fuel/pod_config.yml.j2 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
-index f380535..2d0cdee 100644
---- a/config/installers/fuel/pod_config.yml.j2
-+++ b/config/installers/fuel/pod_config.yml.j2
-@@ -61,6 +61,7 @@ parameters:
-     opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }}
-     opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }}
-     opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }}
-+    opnfv_openstack_proxy_control_address: {{ net_mgmt | ipaddr_index('103') }}
-     opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('104') }}
-     opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('105') }}
-     opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }}