commit 0a539a3c894cf5c8bda6a514ca45f8f04015f5da
author Vasyl Saienko <vsaienko@mirantis.com> Thu Apr 26 18:17:19 2018 +0000
committer Gerrit Code Review <gerrit2@85b573a3ca36> Thu Apr 26 18:17:19 2018 +0000
tree 25c9c8591472a2e03c9b170be1dbc4f13aab5e6f
parent 173a817fe1f6346090ccb35d538acc6fbaae4680
parent beaa36a10fab2b14012721812814d570151d166e

Merge "Adding SALT_MASTER_CREDENTIALS to test-virtual-model"

jenkins/client/init.yml

diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index e4a3fcd..856eec5 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -37,6 +37,7 @@
         ldap: {}
         matrix-auth: {}
         monitoring: {}
+        performance: {}
         pipeline-utility-steps: {}
         rebuild: {}
         simple-theme-plugin: {}

nginx/server/proxy/openstack_api.yml

diff --git a/nginx/server/proxy/openstack_api.yml b/nginx/server/proxy/openstack_api.yml
index f9f363d..9492c56 100644
--- a/nginx/server/proxy/openstack_api.yml
+++ b/nginx/server/proxy/openstack_api.yml
@@ -8,4 +8,3 @@
 - system.nginx.server.proxy.openstack.keystone_private
 - system.nginx.server.proxy.openstack.neutron
 - system.nginx.server.proxy.openstack.nova
-- system.nginx.server.proxy.openstack.nova_ec2