From ae5fcc0dd1d19c750cba8d9bf16545f5a7802287 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 13 Aug 2018 14:51:09 -0400 Subject: Allow common patches file This patch adds allowing for common patches that should be applied to every scenario to be included. It by default pulls in a file in the deploy directory 'common-patches.yaml', but can optionally be overridden. This patch also includes a patch upstream to fix OSCLI not working anymore due to breakage with the Cinder version in the overcloudrc. Change-Id: I97b9efb937deff07e085b9ef75b9799fb65bfc57 Signed-off-by: Tim Rozet --- config/deploy/common-patches.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 config/deploy/common-patches.yaml (limited to 'config/deploy/common-patches.yaml') diff --git a/config/deploy/common-patches.yaml b/config/deploy/common-patches.yaml new file mode 100644 index 00000000..7339e79c --- /dev/null +++ b/config/deploy/common-patches.yaml @@ -0,0 +1,8 @@ +--- +patches: + undercloud: + - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 + project: openstack/tripleo-common + - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395 + project: openstack/tripleo-common + branch: master -- cgit 1.2.3-korg