commit 16b35ea6ccccbdd49f972aed54cb83b06ff26b47
author Vasyl Saienko <vsaienko@mirantis.com> Thu Oct 25 20:42:02 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Oct 25 20:42:02 2018 +0000
tree e81560e2bdd91691878d4588e99e7d8f51797c5d
parent 092db2c039686483e752e159bdc1d3654af54e35
parent 536a683a53a5a6be19f770c005865af4c63fe10c

Merge "Revert "Add neutron metadata for memcache security strategy""

jenkins/client/job/oscore/cookiecutter.yml

diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index 23b9371..2e5f91c 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -77,9 +77,9 @@
                 #Extra context that will be merged with content of COOKIECUTTER_TEMPLATE_CONTEXT_FILE
                 default_context:
                   openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,drivetrain,stacklight,k8s_team,mcp_qa"
-                  cookiecutter_template_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/mk/cookiecutter-templates.git
+                  cookiecutter_template_url: ssh://gerrit.mcp.mirantis.com:29418/mk/cookiecutter-templates.git
                   cookiecutter_template_branch: 'master'
-                  shared_reclass_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/salt-models/reclass-system.git
+                  shared_reclass_url: ssh://gerrit.mcp.mirantis.com:29418/salt-models/reclass-system.git
                   shared_reclass_branch: 'master'
             STACK_INSTALL:
               type: string

jenkins/client/job/stacklight/cookiecutter.yml

diff --git a/jenkins/client/job/stacklight/cookiecutter.yml b/jenkins/client/job/stacklight/cookiecutter.yml
index 9ba858c..e057a26 100644
--- a/jenkins/client/job/stacklight/cookiecutter.yml
+++ b/jenkins/client/job/stacklight/cookiecutter.yml
@@ -61,9 +61,9 @@
                 #Extra context that will be merged with content of COOKIECUTTER_TEMPLATE_CONTEXT_FILE
                 default_context:
                   openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,stacklight,k8s_team,drivetrain"
-                  cookiecutter_template_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/mk/cookiecutter-templates.git
+                  cookiecutter_template_url: ssh://gerrit.mcp.mirantis.com:29418/mk/cookiecutter-templates.git
                   cookiecutter_template_branch: 'master'
-                  shared_reclass_url: ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/salt-models/reclass-system.git
+                  shared_reclass_url: ssh://gerrit.mcp.mirantis.com:29418/salt-models/reclass-system.git
                   shared_reclass_branch: 'master'
             STACK_INSTALL:
               type: string