summaryrefslogtreecommitdiffstats
path: root/config/deploy/os-nosdn-nofeature-noha.yaml
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-06-04 21:19:22 -0400
committerTim Rozet <trozet@redhat.com>2018-06-14 16:25:19 -0400
commitf07870e4a3933cc7e78e6dc6457724bb49cad4f8 (patch)
tree29258209ef54270f70483977410782328b89377d /config/deploy/os-nosdn-nofeature-noha.yaml
parentbd292a3c44dbe385974e4ee41dcb8149558f0be4 (diff)
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 <trozet@redhat.com>
Diffstat (limited to 'config/deploy/os-nosdn-nofeature-noha.yaml')
-rw-r--r--config/deploy/os-nosdn-nofeature-noha.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index e775811..0b1aaa0 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