commit 26231f355839db0b60c439aa561a1a6a22f81b62
author Richard Felkl <rfelkl@mirantis.com> Fri Apr 13 11:25:24 2018 +0200
committer Richard Felkl <rfelkl@mirantis.com> Mon Apr 16 11:18:47 2018 +0200
tree 9522ad1368ae763158620f93790693051ba5b6ce
parent 34d0457dc82bf1e957a1b23dada420a3a03c537e

Add debmirror and watchdog to salt formulas

Change-Id: I5461acfd6f12d9b614c558cbc5250dbb4c064c1a

salt/master/formula/git/foundation.yml

diff --git a/salt/master/formula/git/foundation.yml b/salt/master/formula/git/foundation.yml
index dbc7d19..01affb5 100644
--- a/salt/master/formula/git/foundation.yml
+++ b/salt/master/formula/git/foundation.yml
@@ -12,6 +12,10 @@
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-bind.git'
               revision: ${_param:salt_master_environment_revision}
+            debmirror:
+              source: git
+              address: '${_param:salt_master_environment_repository}/salt-formula-debmirror.git'
+              revision: ${_param:salt_master_environment_revision}
             gerrit:
               module:
                 gerrit.py:

salt/master/formula/git/watchdog.yml

diff --git a/salt/master/formula/git/watchdog.yml b/salt/master/formula/git/watchdog.yml
new file mode 100644
index 0000000..0daab5c
--- /dev/null
+++ b/salt/master/formula/git/watchdog.yml
@@ -0,0 +1,10 @@
+parameters:
+  salt:
+    master:
+      environment:
+        dev:
+          formula:
+            watchdog:
+              source: git
+              address: '${_param:salt_master_environment_repository}/salt-formula-watchdog.git'
+              revision: ${_param:salt_master_environment_revision}
\ No newline at end of file

salt/master/formula/pkg/foundation.yml

diff --git a/salt/master/formula/pkg/foundation.yml b/salt/master/formula/pkg/foundation.yml
index 5d530d4..c34f6a0 100644
--- a/salt/master/formula/pkg/foundation.yml
+++ b/salt/master/formula/pkg/foundation.yml
@@ -13,6 +13,9 @@
             bind:
               source: pkg
               name: salt-formula-bind
+            debmirror:
+              source: pkg
+              name: salt-formula-debmirror
             gerrit:
               source: pkg
               name: salt-formula-gerrit

salt/master/formula/pkg/watchdog.yml

diff --git a/salt/master/formula/pkg/watchdog.yml b/salt/master/formula/pkg/watchdog.yml
new file mode 100644
index 0000000..9a77953
--- /dev/null
+++ b/salt/master/formula/pkg/watchdog.yml
@@ -0,0 +1,9 @@
+parameters:
+  salt:
+    master:
+      environment:
+        prd:
+          formula:
+            watchdog:
+              source: pkg
+              name: salt-formula-watchdog