From 36e4b9754dedef27637c09b510829f686bd469e4 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 16 Sep 2017 21:13:11 +0200 Subject: PDF parsing support - add new git submodule pointing to OPNFV Pharos; - use Pharos 'generate_config.sh' to parse the PDF using the Fuel installer adapter and generate dynamically; - build outside current git repo and sync separately to prevent sensitive data leak; - add PDF sample based on LF-POD2, should be used with 'ci/deploy.sh -l local -p pod1'; Change-Id: I4e1b95f180bcd5ade5d86f516628eb8edbe64b1c Signed-off-by: Alexandru Avadanii --- .../cluster/all-mcp-ocata-common/opnfv/.gitignore | 1 + .../all-mcp-ocata-common/opnfv/pod_config.yml | 93 +--------------------- .../opnfv/pod_config.yml.example | 93 ++++++++++++++++++++++ 3 files changed, 96 insertions(+), 91 deletions(-) create mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore index 4b9ab2b95..bf6a84be7 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore @@ -1 +1,2 @@ runtime.yml +pod_config.yml diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml index ff2991a29..22c6ce624 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml @@ -1,94 +1,5 @@ --- parameters: _param: - # infra service addresses - opnfv_infra_config_address: 10.167.4.100 - opnfv_infra_config_deploy_address: 10.20.0.2 - opnfv_infra_maas_node01_address: 10.167.4.3 - opnfv_infra_maas_node01_deploy_address: 192.168.11.3 - opnfv_infra_compute_node01_address: 10.167.4.141 - opnfv_infra_compute_node02_address: 10.167.4.142 - opnfv_infra_compute_node03_address: 10.167.4.143 - 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_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: 10.167.4.80 - opnfv_openstack_proxy_node01_address: 10.167.4.81 - opnfv_openstack_proxy_node02_address: 10.167.4.82 - 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.2 - opnfv_openstack_compute_node02_external_address: 172.30.10.3 - - opnfv_opendaylight_server_node01_single_address: 10.167.4.111 - - 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" + # NOTE: This file is overwritten at runtime by parsing the PDF. + opnfv_use_pod_descriptor_file: true diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example new file mode 100644 index 000000000..e77ad070e --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example @@ -0,0 +1,93 @@ +--- +parameters: + _param: + + opnfv_infra_config_address: 10.167.4.100 + opnfv_infra_maas_node01_address: 10.167.4.3 + opnfv_infra_maas_node01_deploy_address: 192.168.11.3 + opnfv_infra_compute_node01_address: 10.167.4.141 + opnfv_infra_compute_node02_address: 10.167.4.142 + opnfv_infra_compute_node03_address: 10.167.4.143 + 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_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: 10.167.4.80 + opnfv_openstack_proxy_node01_address: 10.167.4.81 + opnfv_openstack_proxy_node02_address: 10.167.4.82 + 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.2 + opnfv_openstack_compute_node02_external_address: 172.30.10.3 + + opnfv_opendaylight_server_node01_single_address: 10.167.4.111 + + 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' -- cgit 1.2.3-korg