commit 164c8f436f3e67fc041c344676030fc1e91bb6fe
author Vasyl Saienko <vsaienko@mirantis.com> Wed May 30 18:05:12 2018 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> Wed May 30 18:05:12 2018 +0000
tree 31f6c9befea97cd7eb34303bb369fdc346c0e8b9
parent d9ed8ad621030ad9c27f259b266027808a5d49f1
parent e7d4b165bf584e80f1e49b5cf6d00c22d5fe7ea1

Merge "Update k8s images and add pause image vars"

horizon/server/plugin/heat.yml

diff --git a/horizon/server/plugin/heat.yml b/horizon/server/plugin/heat.yml
index 9e70480..909da66 100644
--- a/horizon/server/plugin/heat.yml
+++ b/horizon/server/plugin/heat.yml
@@ -5,7 +5,9 @@
         heat:
           source:
             engine: pkg
-            name: openstack-dashboard-heat-server-templates
-        horizon_overrides:
-          overrides:
-          - heat_server_templates
+            name: python-heat-dashboard
+      policy:
+        orchestration:
+          enabled: true
+          name: heat_policy.json
+          source: file

jenkins/client/job/oscore/tests.yml

diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index be2326b..a85342d 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -148,6 +148,10 @@
                 type: boolean
                 description: Whether to use container with rally
                 default: "{{use_rally}}"
+              TEST_MILESTONE:
+                type: string
+                description: Product milestone
+                default: ""
         test-openstack-component-periodic:
           name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
           template: