From 9b38e04de451a60da0bc8a685612282cd1b60ee6 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 5 Aug 2018 06:37:12 +0200 Subject: [noha] Add mas01 reclass inheritance While at it, move openstack_version param to the common include dir. JIRA: FUEL-382 Change-Id: I5e7ebb18a95672f066126d3afd28f13395a3149f Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/.gitignore | 2 + .../cluster/all-mcp-arch-common/init.yml.j2 | 2 + .../cluster/mcp-common-ha/openstack_init.yml.j2 | 3 -- .../cluster/mcp-common-noha/infra/config.yml.j2 | 1 - .../classes/cluster/mcp-common-noha/infra/init.yml | 31 --------------- .../cluster/mcp-common-noha/infra/init.yml.j2 | 46 ++++++++++++++++++++++ .../cluster/mcp-common-noha/init_options.yml | 26 ------------ .../cluster/mcp-common-noha/init_options.yml.j2 | 27 +++++++++++++ .../cluster/mcp-common-noha/openstack_init.yml.j2 | 1 - .../classes/cluster/mcp-odl-noha/infra/maas.yml | 11 ++++++ .../classes/cluster/mcp-ovn-noha/infra/maas.yml | 11 ++++++ .../cluster/mcp-ovs-dpdk-noha/infra/maas.yml | 11 ++++++ .../classes/cluster/mcp-ovs-noha/infra/maas.yml | 11 ++++++ 13 files changed, 121 insertions(+), 62 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml.j2 create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/infra/maas.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-noha/infra/maas.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/maas.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-noha/infra/maas.yml (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore index 78eb36c1c..437712ec6 100644 --- a/mcp/reclass/classes/cluster/.gitignore +++ b/mcp/reclass/classes/cluster/.gitignore @@ -25,3 +25,5 @@ mcp-odl-ha/opendaylight/control.yml mcp-odl-ha/openstack/init.yml mcp-odl-noha/infra/config.yml mcp-*-noha/openstack/compute.yml +mcp-common-noha/infra/init.yml +mcp-common-noha/init_options.yml diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 index 987c5eb2c..fb1dcacdb 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 @@ -11,6 +11,8 @@ classes: - cluster.all-mcp-arch-common.opnfv parameters: _param: + openstack_version: queens + salt_control_trusty_image: '' # Dummy value, to keep reclass 1.5.2 happy salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 index b575d596c..7aae337c4 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -9,9 +9,6 @@ --- parameters: _param: - - openstack_version: queens - # openstack service addresses {%- if conf.MCP_VCP %} openstack_proxy_control_address: ${_param:opnfv_openstack_proxy_control_address} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 index dc31a93ca..36a2c27ec 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 @@ -13,7 +13,6 @@ classes: parameters: _param: openstack_control_node01_hostname: ctl01 - reclass_config_master: ${_param:opnfv_infra_config_pxe_admin_address} single_address: ${_param:opnfv_infra_config_address} salt_master_host: 127.0.0.1 salt_minion_ca_host: ${linux:network:fqdn} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml deleted file mode 100644 index 772d0880b..000000000 --- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - cluster_domain: ${_param:cluster_name}.local - linux: - system: - apt: - config: - prefer_ipv4: - Acquire::ForceIPv4: true - allow_downgrades: - APT::Get::allow-downgrades: true - network: - host: - cfg01: - address: ${_param:infra_config_address} - names: - - cfg01 - - cfg01.${_param:cluster_domain} - cfg: - address: ${_param:infra_config_address} - names: - - cfg - - cfg.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 new file mode 100644 index 000000000..339d81889 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 @@ -0,0 +1,46 @@ +############################################################################## +# 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 +############################################################################## +{%- import 'net_map.j2' as nm with context %} +--- +classes: + - cluster.all-mcp-arch-common +parameters: + _param: + cluster_domain: ${_param:cluster_name}.local + infra_maas_database_password: opnfv_secret + reclass_config_master: ${_param:opnfv_infra_config_pxe_admin_address} + infra_maas_node01_hostname: mas01 + infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address} + infra_maas_node01_deploy_address: ${_param:opnfv_infra_maas_node01_deploy_address} + linux: + system: + apt: + config: + prefer_ipv4: + Acquire::ForceIPv4: true + allow_downgrades: + APT::Get::allow-downgrades: true + network: + host: + cfg01: + address: ${_param:opnfv_infra_config_address} + names: + - cfg01 + - cfg01.${_param:cluster_domain} + cfg: + address: ${_param:opnfv_infra_config_address} + names: + - cfg + - cfg.${_param:cluster_domain} +{%- if nm.cluster.has_baremetal_nodes %} + mas01: + address: ${_param:infra_maas_node01_address} + names: + - ${_param:infra_maas_node01_hostname} + - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} +{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml b/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml deleted file mode 100644 index 462ab8312..000000000 --- a/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -classes: - - cluster.all-mcp-arch-common -parameters: - _param: - # infra service addresses - infra_config_address: ${_param:opnfv_infra_config_address} - # openstack service addresses - openstack_control_address: ${_param:opnfv_openstack_control_node01_address} - openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address} - openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address} - openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address} - openstack_database_address: ${_param:openstack_control_address} - openstack_message_queue_address: ${_param:openstack_control_address} - openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} - openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} - openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} - openstack_gateway_address: ${_param:opnfv_openstack_gateway_node01_address} - control_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml.j2 new file mode 100644 index 000000000..f59ffac54 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml.j2 @@ -0,0 +1,27 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - cluster.all-mcp-arch-common +parameters: + _param: + # infra service addresses + infra_config_address: ${_param:opnfv_infra_config_address} + infra_config_deploy_address: {{ conf.SALT_MASTER }} + # openstack service addresses + openstack_control_address: ${_param:opnfv_openstack_control_node01_address} + openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address} + openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address} + openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address} + openstack_database_address: ${_param:openstack_control_address} + openstack_message_queue_address: ${_param:openstack_control_address} + openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} + openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} + openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} + openstack_gateway_address: ${_param:opnfv_openstack_gateway_node01_address} + control_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 index 2e0a13175..e25d8e301 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 @@ -9,7 +9,6 @@ --- parameters: _param: - openstack_version: queens apt_mk_version: nightly mcp_repo_version: 1.1 openstack_region: RegionOne diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/maas.yml new file mode 100644 index 000000000..b359cfe3b --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - cluster.all-mcp-arch-common.infra.maas + - cluster.mcp-odl-noha.infra diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/maas.yml new file mode 100644 index 000000000..4d25f27c7 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - cluster.all-mcp-arch-common.infra.maas + - cluster.mcp-ovn-noha.infra diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/maas.yml new file mode 100644 index 000000000..57a87d69c --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - cluster.all-mcp-arch-common.infra.maas + - cluster.mcp-ovs-dpdk-noha.infra diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/maas.yml new file mode 100644 index 000000000..bae884fb6 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - cluster.all-mcp-arch-common.infra.maas + - cluster.mcp-ovs-noha.infra -- cgit 1.2.3-korg