commit dc387122fc1b909aa560904eb36d13df43195fe2
author Ondrej Smola <osmola@mirantis.com> Mon Jun 11 08:47:45 2018 +0000
committer Gerrit Code Review <gerrit2@99e8dbefe3b7> Mon Jun 11 08:47:45 2018 +0000
tree 7a2094ce57fcd0c3f3d4fc6b0a32cd96f2a11f22
parent eca2fa752bc23712d04997f01a204a47b060f2cd
parent 8b95093c20b7385b17502691a3ff863a8dab26ab

Merge "Add oslo-templates formula to openstack salt formulas"

salt/master/formula/git/openstack.yml

diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index cd9df0a..093279a 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -104,6 +104,10 @@
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-opencontrail.git'
               revision: ${_param:salt_master_environment_revision}
+            oslo_templates:
+              source: git
+              address: '${_param:salt_master_environment_repository}/salt-formula-oslo-templates.git'
+              revision: ${_param:salt_master_environment_revision}
             python:
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-python.git'

salt/master/formula/pkg/openstack.yml

diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index 3d22c41..381ae1a 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -76,6 +76,9 @@
             octavia:
               source: pkg
               name: salt-formula-octavia
+            oslo_templates:
+              source: pkg
+              name: salt-formula-oslo-templates
             opencontrail:
               source: pkg
               name: salt-formula-opencontrail