commit 048cc23b5939f03d885c2d2d61a91d53ed00c7b2
author Jakub Josef <jjosef@mirantis.com> Wed Oct 04 14:08:30 2017 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> Wed Oct 04 14:08:30 2017 +0000
tree 529469d6ccbe1a17afe10762597a9e203e3776ba
parent 01062b3e5fc8d5af7d9ec3fbe3e4ea047c4a0e52
parent 6abddd69a0af8d037cb77f838af97f7625b07d05

Merge "Add barbican formulas"

salt/master/formula/git/openstack.yml

diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index 9173a4a..3472f2e 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -12,6 +12,10 @@
             #  source: git
             #  address: '${_param:salt_master_environment_repository}/salt-formula-avinetworks.git'
             #  revision: ${_param:salt_master_environment_revision}
+            barbican:
+              source: git
+              address: '${_param:salt_master_environment_repository}/salt-formula-barbican.git'
+              revision: ${_param:salt_master_environment_revision}
             billometer:
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-billometer.git'

salt/master/formula/pkg/openstack.yml

diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index 827f096..663572b 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -10,6 +10,9 @@
             #avinetworks:
             #  source: pkg
             #  name: salt-formula-avinetworks
+            barbican:
+              source: pkg
+              name: salt-formula-barbican
             billometer:
               source: pkg
               name: salt-formula-billometer