diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-06-04 21:19:22 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-06-14 16:25:19 -0400 |
| commit | f07870e4a3933cc7e78e6dc6457724bb49cad4f8 (patch) | |
| tree | 29258209ef54270f70483977410782328b89377d /config/deploy | |
| parent | bd292a3c44dbe385974e4ee41dcb8149558f0be4 (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')
| -rw-r--r-- | config/deploy/os-nosdn-nofeature-ha.yaml | 4 | ||||
| -rw-r--r-- | config/deploy/os-nosdn-nofeature-noha.yaml | 4 | ||||
| -rw-r--r-- | config/deploy/os-odl-nofeature-ha.yaml | 4 | ||||
| -rw-r--r-- | config/deploy/os-odl-nofeature-noha.yaml | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml index 26d30e5e..13bf6d89 100644 --- a/config/deploy/os-nosdn-nofeature-ha.yaml +++ b/config/deploy/os-nosdn-nofeature-ha.yaml @@ -1,6 +1,10 @@ --- global_params: ha_enabled: true + patches: + undercloud: + - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 + project: openstack/tripleo-heat-templates deploy_options: containers: true os_version: master 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 diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml index 24c200ff..313cb1f4 100644 --- a/config/deploy/os-odl-nofeature-ha.yaml +++ b/config/deploy/os-odl-nofeature-ha.yaml @@ -3,8 +3,8 @@ global_params: ha_enabled: true patches: undercloud: - - change-id: I3431d2ec724a880baf0de8f586490d145bedf870 - project: openstack/python-tripleoclient + - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 + project: openstack/tripleo-heat-templates deploy_options: containers: true os_version: master diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml index c7e82e51..e2b34642 100644 --- a/config/deploy/os-odl-nofeature-noha.yaml +++ b/config/deploy/os-odl-nofeature-noha.yaml @@ -3,8 +3,8 @@ global_params: ha_enabled: false patches: undercloud: - - change-id: I3431d2ec724a880baf0de8f586490d145bedf870 - project: openstack/python-tripleoclient + - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 + project: openstack/tripleo-heat-templates deploy_options: containers: true |