From 058c64ae668191ca8223afa581c7b3214b52fe4a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 26 Jan 2018 21:59:28 +0100 Subject: [PDF] Switch to generate_config, unify templates - move bash template handling (previously expanded via `envsubst`) to lib.sh; - move j2 template handling to lib.sh; - move virsh network templates to 'mcp/scripts/virsh_net' subdir; - switch virsh network templates from `envsubst` expansion to j2 and leverage generate_config.py, similar to PDF Fuel installer adapter; - add relevant runtime env vars (e.g. SALT_MASTER, MAAS_IP) on the fly to PDF, to consume them in templates like params coming from PDF; - parameterize virsh network definitions based on PDF (mgmt, public); JIRA: FUEL-322 Change-Id: Ib94e78fc4f25797b9354a0552e884104da5d0003 Signed-off-by: Alexandru Avadanii --- .../cluster/all-mcp-arch-common/opnfv/pod_config.yml | 12 ------------ .../classes/cluster/all-mcp-arch-common/opnfv/runtime.yml | 14 -------------- .../cluster/all-mcp-arch-common/opnfv/runtime.yml.j2 | 15 +++++++++++++++ .../all-mcp-arch-common/opnfv/runtime.yml.template | 14 -------------- 4 files changed, 15 insertions(+), 40 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml delete mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv') diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml deleted file mode 100644 index d72df2eb6..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml +++ /dev/null @@ -1,12 +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: - # 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-arch-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml deleted file mode 100644 index 387b57f8b..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml +++ /dev/null @@ -1,14 +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_salt_master_ip: 10.20.0.2 - opnfv_maas_mcp_address: 10.20.0.3 - opnfv_net_mcpcontrol: 10.20.0.0 - opnfv_net_mcpcontrol_mask: 255.255.255.0 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.j2 new file mode 100644 index 000000000..d6f5aa965 --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.j2 @@ -0,0 +1,15 @@ +############################################################################## +# 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 +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +{#- conf.MCPCONTROL_NET & co are mandatory, defaults are set via globals.sh #} +parameters: + _param: + opnfv_salt_master_ip: {{ conf.SALT_MASTER }} + opnfv_maas_mcp_address: {{ conf.MAAS_IP }} + opnfv_net_mcpcontrol: {{ conf.MCPCONTROL_NET }} + opnfv_net_mcpcontrol_mask: {{ conf.MCPCONTROL_PREFIX | netmask }} diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template deleted file mode 100644 index 64f75350c..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template +++ /dev/null @@ -1,14 +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_salt_master_ip: ${SALT_MASTER} - opnfv_maas_mcp_address: ${MAAS_IP} - opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0 - opnfv_net_mcpcontrol_mask: 255.255.255.0 -- cgit 1.2.3-korg