Foundation packages
diff --git a/salt/master/formula/git/aptly.yml b/salt/master/formula/git/aptly.yml
deleted file mode 100644
index ee3133f..0000000
--- a/salt/master/formula/git/aptly.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- salt:
- master:
- environment:
- dev:
- formula:
- aptly:
- source: git
- address: '${_param:salt_master_environment_repository}/salt-formula-aptly.git'
- revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/git/foundation.yml b/salt/master/formula/git/foundation.yml
new file mode 100644
index 0000000..2f9f635
--- /dev/null
+++ b/salt/master/formula/git/foundation.yml
@@ -0,0 +1,31 @@
+parameters:
+ salt:
+ master:
+ environment:
+ dev:
+ formula:
+ aptly:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-aptly.git'
+ revision: ${_param:salt_master_environment_revision}
+ bind:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-bind.git'
+ revision: ${_param:salt_master_environment_revision}
+ gerrit:
+ module:
+ gerrit.py:
+ enabled: true
+ state:
+ gerrit.py:
+ enabled: true
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-gerrit.git'
+ revision: ${_param:salt_master_environment_revision}
+ jenkins:
+ module:
+ jenkins_hash.py:
+ enabled: true
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-jenkins.git'
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/pkg/aptly.yml b/salt/master/formula/pkg/aptly.yml
deleted file mode 100644
index 2bcaf52..0000000
--- a/salt/master/formula/pkg/aptly.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-parameters:
- salt:
- master:
- environment:
- prd:
- formula:
- aptly:
- source: pkg
- name: salt-formula-aptly
diff --git a/salt/master/formula/pkg/foundation.yml b/salt/master/formula/pkg/foundation.yml
new file mode 100644
index 0000000..4b2b669
--- /dev/null
+++ b/salt/master/formula/pkg/foundation.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ aptly:
+ source: pkg
+ name: salt-formula-aptly
+ bind:
+ source: pkg
+ name: salt-formula-bind
+ gerrit:
+ source: pkg
+ name: salt-formula-gerrit
+ jenkins:
+ source: pkg
+ name: salt-formula-jenkins