commit 8b95093c20b7385b17502691a3ff863a8dab26ab
author Vasyl Saienko <vsaienko@mirantis.com> Fri May 25 10:26:16 2018 +0300
committer Vasyl Saienko <vsaienko@mirantis.com> Fri Jun 08 20:14:38 2018 +0000
tree 40a665d188cf03cfede59e3e388f18ced506df4c
parent f25a8b780db14e083a2823c5c1fa329a7db874e0

Add oslo-templates formula to openstack salt formulas

Starting from Queens release all openstack formulas directly
dependent on salt-formula-oslo-template. This patch adds
oslo-templates to openstack formulas list directly.

Change-Id: I8eed9d0e5f1afd35db51d611dda50d899460324f

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