commit 29a20f4aed33b574d174709b7d7e2f28e7024555
author Elena Ezhova <eezhova@mirantis.com> Wed Jun 07 15:39:49 2017 +0400
committer Elena Ezhova <eezhova@mirantis.com> Wed Jun 07 15:39:49 2017 +0400
tree b2f6cf7a5fc27fcbd5d081e2ac68d14289e2e8ae
parent e90a84725137523f51627fcdeb30b92ad03ee37b

Add octavia formula to salt master metadata

Change-Id: I0ecb5a87f47d681d5e770d21e080f5b99ece9c8e

salt/master/formula/git/openstack.yml

diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index 36ddfc2..9173a4a 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -92,6 +92,10 @@
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-nova.git'
               revision: ${_param:salt_master_environment_revision}
+            octavia:
+              source: git
+              address: '${_param:salt_master_environment_repository}/salt-formula-octavia.git'
+              revision: ${_param:salt_master_environment_revision}
             opencontrail:
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-opencontrail.git'

salt/master/formula/pkg/openstack.yml

diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index b1222d1..827f096 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -70,6 +70,9 @@
             nova:
               source: pkg
               name: salt-formula-nova
+            octavia:
+              source: pkg
+              name: salt-formula-octavia
             opencontrail:
               source: pkg
               name: salt-formula-opencontrail