commit 611fba1110cd59c51d569873eedecb58a4846fd3
author Ilya Kharin <ikharin@mirantis.com> Fri Jun 30 16:22:33 2017 +0400
committer Ilya Kharin <ikharin@mirantis.com> Sat Jul 01 10:37:31 2017 +0400
tree 6dae97ff677736950208400af19b88b26226c40e
parent 569d5dccc5d34d6553e1f32da1b19d249661b35b

Link devops-portal and rundeck on github.com

Also, a list of states for the rundeck formula was actualized.

Change-Id: Ib10096d1772053e72efd8cd42fa1e55963caaf87

salt/master/formula/git/oss.yml

diff --git a/salt/master/formula/git/oss.yml b/salt/master/formula/git/oss.yml
index e927387..64f3e54 100644
--- a/salt/master/formula/git/oss.yml
+++ b/salt/master/formula/git/oss.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    salt_master_oss_repository: https://gerrit.mcp.mirantis.net/salt-formulas
-    salt_master_oss_revision: master
   salt:
     master:
       environment:
@@ -12,8 +9,8 @@
                 devops_utils.py:
                   enabled: true
               source: git
-              address: '${_param:salt_master_oss_repository}/devops-portal.git'
-              revision: ${_param:salt_master_oss_revision}
+              address: '${_param:salt_master_environment_repository}/salt-formula-devops-portal.git'
+              revision: ${_param:salt_master_environment_revision}
             rundeck:
               module:
                 rundeck.py:
@@ -21,6 +18,12 @@
               state:
                 rundeck_project.py:
                   enabled: true
+              state:
+                rundeck_scm.py:
+                  enabled: true
+              state:
+                rundeck_secret.py:
+                  enabled: true
               source: git
-              address: '${_param:salt_master_oss_repository}/rundeck.git'
-              revision: ${_param:salt_master_oss_revision}
+              address: '${_param:salt_master_environment_repository}/salt-formula-rundeck.git'
+              revision: ${_param:salt_master_environment_revision}