aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/deploy.sh5
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example111
2 files changed, 3 insertions, 113 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index cf166bae9..5026d2d84 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -70,10 +70,10 @@ $(notify "Input parameters to the build script are:" 2)
companion should be available at:
<base-uri>/labs/<lab-name>/<pod-name>.yaml
<base-uri>/labs/<lab-name>/idf-<pod-name>.yaml
- An example config is provided inside current repo in
- <./mcp/config>.
The default is using the git submodule tracking 'OPNFV Pharos' in
<./mcp/scripts/pharos>.
+ An example config is provided inside current repo in
+ <./mcp/config>, automatically linked as <./mcp/scripts/pharos/labs/local>.
-d Dry-run - Produce deploy config files, but do not execute deploy
-D Debug logging - Enable extra logging in sh deploy scripts (set -x)
-e Do not launch environment deployment
@@ -285,6 +285,7 @@ LOCAL_PDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_PDF}")"
LOCAL_IDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_IDF}")"
LOCAL_PDF_RECLASS="${STORAGE_DIR}/pod_config.yml"
rm -f "${LOCAL_PDF_RECLASS}"
+ln -sf "$(readlink -f "../config/labs/local")" "./pharos/labs/"
if ! curl --create-dirs -o "${LOCAL_PDF}" "${BASE_CONFIG_PDF}"; then
if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then
notify "[ERROR] Could not retrieve PDF (Pod Descriptor File)!\n" 1>&2
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example
deleted file mode 100644
index 628aeba83..000000000
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example
+++ /dev/null
@@ -1,111 +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
-##############################################################################
----
-parameters:
- _param:
-
- opnfv_infra_config_address: 10.167.4.100
- opnfv_infra_config_pxe_address: 192.168.11.2
- opnfv_infra_maas_node01_address: 10.167.4.3
- opnfv_infra_maas_node01_deploy_address: 192.168.11.3
- opnfv_infra_kvm_address: 10.167.4.140
- opnfv_infra_kvm_node01_address: 10.167.4.141
- opnfv_infra_kvm_node02_address: 10.167.4.142
- opnfv_infra_kvm_node03_address: 10.167.4.143
-
- opnfv_infra_maas_pxe_network_address: 192.168.11.0
- opnfv_infra_maas_pxe_start_address: 192.168.11.4
- opnfv_infra_maas_pxe_end_address: 192.168.11.100
-
- opnfv_openstack_gateway_node01_address: 10.167.4.124
- opnfv_openstack_gateway_node02_address: 10.167.4.125
- opnfv_openstack_gateway_node03_address: 10.167.4.126
- opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6
- opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7
- opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9
- opnfv_openstack_proxy_address: 172.30.10.103
- opnfv_openstack_proxy_node01_address: 172.30.10.104
- opnfv_openstack_proxy_node02_address: 172.30.10.105
- opnfv_openstack_proxy_control_address: 10.167.4.103
- opnfv_openstack_proxy_node01_control_address: 10.167.4.104
- opnfv_openstack_proxy_node02_control_address: 10.167.4.105
- opnfv_openstack_control_address: 10.167.4.10
- opnfv_openstack_control_node01_address: 10.167.4.11
- opnfv_openstack_control_node02_address: 10.167.4.12
- opnfv_openstack_control_node03_address: 10.167.4.13
- opnfv_openstack_database_address: 10.167.4.50
- opnfv_openstack_database_node01_address: 10.167.4.51
- opnfv_openstack_database_node02_address: 10.167.4.52
- opnfv_openstack_database_node03_address: 10.167.4.53
- opnfv_openstack_message_queue_address: 10.167.4.40
- opnfv_openstack_message_queue_node01_address: 10.167.4.41
- opnfv_openstack_message_queue_node02_address: 10.167.4.42
- opnfv_openstack_message_queue_node03_address: 10.167.4.43
- opnfv_openstack_telemetry_address: 10.167.4.75
- opnfv_openstack_telemetry_node01_address: 10.167.4.76
- opnfv_openstack_telemetry_node02_address: 10.167.4.77
- opnfv_openstack_telemetry_node03_address: 10.167.4.78
- opnfv_openstack_compute_node01_single_address: 10.167.4.101
- opnfv_openstack_compute_node02_single_address: 10.167.4.102
- opnfv_openstack_compute_node03_single_address: 10.167.4.103
- opnfv_openstack_compute_node01_control_address: 10.167.4.101
- opnfv_openstack_compute_node02_control_address: 10.167.4.102
- opnfv_openstack_compute_node03_control_address: 10.167.4.103
- opnfv_openstack_compute_node01_tenant_address: 10.1.0.101
- opnfv_openstack_compute_node02_tenant_address: 10.1.0.102
- opnfv_openstack_compute_node03_tenant_address: 10.1.0.103
- opnfv_openstack_compute_node01_external_address: 172.30.10.101
- opnfv_openstack_compute_node02_external_address: 172.30.10.102
-
- opnfv_opendaylight_server_node01_single_address: 10.167.4.111
-
- opnfv_net_public: 172.30.10.0/24
- opnfv_net_public_mask: 255.255.255.0
- opnfv_net_public_gw: 172.30.10.1
- opnfv_net_public_pool_start: 172.30.10.80
- opnfv_net_public_pool_end: 172.30.10.100
- opnfv_name_servers: ['8.8.8.8', '8.8.4.4']
- opnfv_dns_server01: '8.8.8.8'
-
- opnfv_net_mgmt_vlan: 300
- opnfv_net_tenant_vlan: 1000
-
- opnfv_maas_node01_architecture: 'amd64/generic'
- opnfv_maas_node01_power_address: 172.30.8.75
- opnfv_maas_node01_power_type: ipmi
- opnfv_maas_node01_power_user: admin
- opnfv_maas_node01_power_password: octopus
- opnfv_maas_node01_interface_mac: '00:25:b5:a0:00:2a'
-
- opnfv_maas_node02_architecture: 'amd64/generic'
- opnfv_maas_node02_power_address: 172.30.8.65
- opnfv_maas_node02_power_type: ipmi
- opnfv_maas_node02_power_user: admin
- opnfv_maas_node02_power_password: octopus
- opnfv_maas_node02_interface_mac: '00:25:b5:a0:00:3a'
-
- opnfv_maas_node03_architecture: 'amd64/generic'
- opnfv_maas_node03_power_address: 172.30.8.74
- opnfv_maas_node03_power_type: ipmi
- opnfv_maas_node03_power_user: admin
- opnfv_maas_node03_power_password: octopus
- opnfv_maas_node03_interface_mac: '00:25:b5:a0:00:4a'
-
- opnfv_maas_node04_architecture: 'amd64/generic'
- opnfv_maas_node04_power_address: 172.30.8.73
- opnfv_maas_node04_power_type: ipmi
- opnfv_maas_node04_power_user: admin
- opnfv_maas_node04_power_password: octopus
- opnfv_maas_node04_interface_mac: '00:25:b5:a0:00:5a'
-
- opnfv_maas_node05_architecture: 'amd64/generic'
- opnfv_maas_node05_power_address: 172.30.8.72
- opnfv_maas_node05_power_type: ipmi
- opnfv_maas_node05_power_user: admin
- opnfv_maas_node05_power_password: octopus
- opnfv_maas_node05_interface_mac: '00:25:b5:a0:00:6a'