commit 2583fb6a1aa989d44dbd4954ec4cefd345fdbab9
author Ondrej Smola <osmola@mirantis.com> Wed May 02 10:07:50 2018 +0000
committer Gerrit Code Review <gerrit2@1f6678a0cecc> Wed May 02 10:07:50 2018 +0000
tree 1d0639ed17e147c29fef6847e5925e6f2ab627c1
parent 29a6715726d92fd85126500d7ab8793ea501f242
parent cbc26d4f58183d5e562328cae04cad0f1eb59199

Merge "Add kubernetes_contrail_cluster"

horizon/server/plugin/contrail.yml

diff --git a/horizon/server/plugin/contrail.yml b/horizon/server/plugin/contrail.yml
index 669dbb6..03da87e 100644
--- a/horizon/server/plugin/contrail.yml
+++ b/horizon/server/plugin/contrail.yml
@@ -9,3 +9,5 @@
         horizon_overrides:
           overrides:
           - contrail_openstack_dashboard
+      openstack_neutron_network:
+        enable_fip_topology_check: False
\ No newline at end of file

jenkins/client/job/oscore/tests.yml

diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 4453dae..cdc2b35 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -283,6 +283,10 @@
                 type: boolean
                 default: "{{run_smoke}}"
                 description: Enabling of running smoke tests
+              SALT_MASTER_CREDENTIALS:
+                type: string
+                default: "salt-qa-credentials"
+                description: Jenkins credential ID for Salt master
         test-runner-template:
           name: "{{job_prefix}}-{{test_type}}-runner"
           template: