From f07870e4a3933cc7e78e6dc6457724bb49cad4f8 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 4 Jun 2018 21:19:22 -0400 Subject: Fixes deployment failure with allNodesConfig This pulls in upstream patch to revert a bad commit that causes the "Unknown Property controller_ips". Also includes a fix for being able to detect if patches that are merged upstream are also promoted into TripleO images or container images. This happens by comparing the time the patch was submitted to the time when the TripleO Image or Docker Image was last updated. JIRA: APEX-610 JIRA: APEX-612 Change-Id: I1c2ab7fb4425b407acd7b6d9ebab914ed3a24478 Signed-off-by: Tim Rozet --- config/deploy/os-nosdn-nofeature-noha.yaml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config/deploy/os-nosdn-nofeature-noha.yaml') diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml index e7758113..0b1aaa04 100644 --- a/config/deploy/os-nosdn-nofeature-noha.yaml +++ b/config/deploy/os-nosdn-nofeature-noha.yaml @@ -1,6 +1,10 @@ --- global_params: ha_enabled: false + patches: + undercloud: + - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 + project: openstack/tripleo-heat-templates deploy_options: containers: true os_version: master -- cgit 1.2.3-korg