Add CI/CD infrastructure
Change-Id: Id15634c2096394f7de4533c8466e0e0c2e66f8ed
diff --git a/salt/master/git.yml b/salt/master/git.yml
index d9bbd80..bcde77c 100644
--- a/salt/master/git.yml
+++ b/salt/master/git.yml
@@ -1,10 +1,11 @@
classes:
- system.salt.master.single
+- system.salt.master.formula.git.ccp
+- system.salt.master.formula.git.foundation
+- system.salt.master.formula.git.kubernetes
- system.salt.master.formula.git.openstack
- system.salt.master.formula.git.saltstack
- system.salt.master.formula.git.stacklight
-- system.salt.master.formula.git.kubernetes
-- system.salt.master.formula.git.ccp
parameters:
_param:
salt_master_environment_repository: "https://github.com/salt-formulas"
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index 72325c9..7686f07 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -1,8 +1,9 @@
classes:
- system.salt.master.single
+- system.salt.master.formula.pkg.ccp
+- system.salt.master.formula.pkg.foundation
+- system.salt.master.formula.pkg.kubernetes
- system.salt.master.formula.pkg.openstack
- system.salt.master.formula.pkg.saltstack
- system.salt.master.formula.pkg.stacklight
-- system.salt.master.formula.pkg.kubernetes
-- system.salt.master.formula.pkg.ccp
- system.linux.system.repo.tcp_salt
diff --git a/salt/minion/ca/salt_master.yml b/salt/minion/ca/salt_master.yml
index 30c9d9b..3e42db5 100644
--- a/salt/minion/ca/salt_master.yml
+++ b/salt/minion/ca/salt_master.yml
@@ -1,7 +1,7 @@
parameters:
_param:
salt_minion_ca_common_name: Salt Master CA
- salt_minion_ca_country: cz
+ salt_minion_ca_country: cz
salt_minion_ca_locality: Prague
salt_minion_ca_organization: Mirantis
salt_minion_ca_days_valid_authority: 3650