summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-16 13:49:21 -0400
committerTim Rozet <trozet@redhat.com>2018-07-17 17:34:02 -0400
commit6b9d8c01be763bbf46048caa08902880367672a7 (patch)
tree9388f549db33b8b862ba65641575fde170ea0e88 /config
parentb5e2f1f65dee0cd692fe275d6bce69a8e410cac3 (diff)
Update queens ODL to include OF table fix
Also includes minor fix to patching where stable was not being removed from the short hand branch name correctly. Includes fix where path was changed in queens for env files: https://review.openstack.org/#/c/567810/ Change-Id: Ia3a6769be70ea97c9bec9d5539c9ab0373fed30a Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config')
-rw-r--r--config/deploy/os-odl-queens-ha.yaml5
-rw-r--r--config/deploy/os-odl-queens-noha.yaml7
2 files changed, 9 insertions, 3 deletions
diff --git a/config/deploy/os-odl-queens-ha.yaml b/config/deploy/os-odl-queens-ha.yaml
index 62a12d2b..1295de04 100644
--- a/config/deploy/os-odl-queens-ha.yaml
+++ b/config/deploy/os-odl-queens-ha.yaml
@@ -1,6 +1,11 @@
---
global_params:
ha_enabled: true
+ patches:
+ overcloud:
+ - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+ project: openstack/puppet-tripleo
+ branch: stable/queens
deploy_options:
containers: true
os_version: queens
diff --git a/config/deploy/os-odl-queens-noha.yaml b/config/deploy/os-odl-queens-noha.yaml
index 75a7346c..d3d42476 100644
--- a/config/deploy/os-odl-queens-noha.yaml
+++ b/config/deploy/os-odl-queens-noha.yaml
@@ -2,9 +2,10 @@
global_params:
ha_enabled: false
patches:
- undercloud:
- - change-id: Ie380cc41ca50a294a2647d673f339d02111bf6b3
- project: openstack/tripleo-heat-templates
+ overcloud:
+ - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+ project: openstack/puppet-tripleo
+ branch: stable/queens
deploy_options:
containers: true
os_version: queens