path: root/config/deploy/os-nosdn-nofeature-noha.yaml
diff options
authorTim Rozet <>2018-08-14 21:17:33 -0400
committerTim Rozet <>2018-08-15 10:58:31 -0400
commitc0a4aa96bbe70eefb179d59a1267b8115651bba5 (patch)
tree27fdca2b00d5ef995d00bf7e91922d78358123bd /config/deploy/os-nosdn-nofeature-noha.yaml
parentae5fcc0dd1d19c750cba8d9bf16545f5a7802287 (diff)
Modify common patches schema to per branch
The common patch design doesn't really work across branches very well. This patch makes it so the common patches are specified in the same file, but on a per branch basis. Making it easier to manage common patches per branch. Also, includes a fix and adds test coverage to the prep_image method where we were referencing 'undercloud_admin_ip' before assignment in a case where we were not using ODL and had patches to overcloud. Change-Id: I7672947afd826fdc0042361a0139e22d6d5dd864 Signed-off-by: Tim Rozet <>
Diffstat (limited to 'config/deploy/os-nosdn-nofeature-noha.yaml')
1 files changed, 1 insertions, 0 deletions
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index e775811..0725031 100644
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -1,6 +1,7 @@
ha_enabled: false
containers: true
os_version: master