commit fc1e401ec4f914511594ab9532f64f0b6d149c6d
author Jakub Josef <jjosef@mirantis.com> Mon Mar 12 11:00:22 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Mon Mar 12 11:00:22 2018 +0000
tree b09470fdd9e3bb3821c5eb55da1bded2868602ca
parent 95f17cf163fcc1c20c2c4f249084b4d228e973e1
parent 167e8afc91579f28d377eb1e4a8662d66270ffff

Merge "Add ability to install gnocchi salt formula"

salt/master/formula/git/gnocchi.yml

diff --git a/salt/master/formula/git/gnocchi.yml b/salt/master/formula/git/gnocchi.yml
new file mode 100644
index 0000000..53d2f56
--- /dev/null
+++ b/salt/master/formula/git/gnocchi.yml
@@ -0,0 +1,10 @@
+parameters:
+  salt:
+    master:
+      environment:
+        dev:
+          formula:
+            gnocchi:
+              source: git
+              address: '${_param:salt_master_environment_repository}/salt-formula-gnocchi.git'
+              revision: ${_param:salt_master_environment_revision}

salt/master/formula/pkg/gnocchi.yml

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