From 9b38e04de451a60da0bc8a685612282cd1b60ee6 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 <Alexandru.Avadanii@enea.com>
---
 .../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 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 32 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

(limited to 'mcp/reclass/classes/cluster/mcp-common-noha/infra')

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 %}
-- 
cgit 1.2.3-korg