data/prodinf01n01.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::infra::puppet::master
+  - roles::puppet::puppetmaster
 environment: testing

data/prodinf01n04.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::infra::puppetdb::api
+  - roles::puppet::puppetdb_api
 environment: testing

data/prodinf01n05.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::infra::puppetdb::sql
+  - roles::puppet::puppetdb_sql
 environment: testing

data/prodinf01n06.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::infra::puppetboard::server
+  - roles::puppet::puppetboard
 environment: testing

data/prodinf01n07.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::infra::dns::resolver
+  - roles::base
 environment: testing

data/prodinf01n08.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::infra::dns::resolver
+  - roles::base
 environment: testing

data/prodinf01n09.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::infra::ntp::server
+  - roles::base
 environment: testing

data/prodinf01n10.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::infra::ntp::server
+  - roles::base
 environment: testing

data/prodinf01n17.main.unkin.net.yaml

@@ -1,6 +1,4 @@
 ---
 classes:
-  - roles::infra::storage::minio
+  - roles::ceph::osd
 environment: testing
-parameters:
-  minio_pool: pool1

data/prodinf01n18.main.unkin.net.yaml

@@ -1,6 +1,4 @@
 ---
 classes:
-  - roles::infra::storage::minio
+  - roles::ceph::osd
 environment: testing
-parameters:
-  minio_pool: pool1

data/prodinf01n19.main.unkin.net.yaml

@@ -1,6 +1,4 @@
 ---
 classes:
-  - roles::infra::storage::minio
+  - roles::ceph::osd
 environment: testing
-parameters:
-  minio_pool: pool1

data/prodinf01n20.main.unkin.net.yaml

@@ -1,6 +1,4 @@
 ---
 classes:
-  - roles::infra::storage::minio
+  - roles::ceph::osd
 environment: testing
-parameters:
-  minio_pool: pool1

data/prodinf01n21.main.unkin.net.yaml

@@ -1,6 +1,4 @@
 ---
 classes:
-  - roles::infra::storage::minio
+  - roles::ceph::osd
 environment: testing
-parameters:
-  minio_pool: pool1

data/prodinf01n22.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::reposync::syncer
-environment: testing

data/prodinf01n23.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::dns::master
-environment: testing

data/prodinf01n24.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::dns::master
-environment: testing

data/prodinf01n25.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::metrics::prometheus
-environment: testing

data/prodinf01n26.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::metrics::prometheus
-environment: testing

data/prodinf01n27.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::metrics::grafana
-environment: testing

data/prodinf01n28.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::metrics::grafana
-environment: testing

data/prodinf01n29.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::sql::galera
-environment: testing

data/prodinf01n30.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::sql::galera
-environment: testing

data/prodinf01n31.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::sql::galera
-environment: testing

data/prodinf01n32.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::halb::haproxy
-environment: testing

data/prodinf01n33.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::halb::haproxy
-environment: testing

data/prodinf01n34.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::storage::consul
-environment: testing

data/prodinf01n35.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::storage::consul
-environment: testing

data/prodinf01n36.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::storage::consul
-environment: testing

data/prodinf01n37.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::storage::vault
-environment: testing

data/prodinf01n38.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::storage::vault
-environment: testing

data/prodinf01n39.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::storage::vault
-environment: testing

data/prodinf01n40.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::db::redis
-environment: testing

data/prodinf01n41.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::db::redis
-environment: testing

data/prodinf01n42.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::db::redis
-environment: testing

data/prodinf01n43.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::engine
-environment: testing

data/prodinf01n44.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodinf01n45.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodinf01n46.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodinf01n47.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodinf01n48.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::cobbler::server
-environment: testing

data/prodinf01n49.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::dhcp::server
-environment: testing

data/prodinf01n50.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::base
-environment: testing

data/prodnxsr0001.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodnxsr0002.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodnxsr0003.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodnxsr0004.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodnxsr0005.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodnxsr0006.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

data/prodnxsr0007.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::ovirt::node
-environment: testing

enc.py

@@ -34,11 +34,11 @@ def main():
 
             # Add 'enc_role' parameter with classes data
             if "classes" in data:
-                data["parameters"]["enc_role"] = data["classes"][:]
+                data["parameters"]["enc_role"] = data["classes"]
 
             # Copy the environment to the parameters, if it exists
             if data.get("environment"):
-                data["parameters"]["enc_env"] = data["environment"][:]
+                data["parameters"]["enc_env"] = data["environment"]
 
             # If the environment is 'testing', remove it
             if data.get("environment") == "testing":

templates/almalinux.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - ROLE
-environment: ENV