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 --- apex/tests/config/dummy-deploy-settings.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 apex/tests/config/dummy-deploy-settings.yaml (limited to 'apex/tests/config/dummy-deploy-settings.yaml') diff --git a/apex/tests/config/dummy-deploy-settings.yaml b/apex/tests/config/dummy-deploy-settings.yaml new file mode 100644 index 00000000..54890f38 --- /dev/null +++ b/apex/tests/config/dummy-deploy-settings.yaml @@ -0,0 +1,19 @@ +--- +global_params: + ha_enabled: false + patches: + undercloud: + - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 + project: openstack/tripleo-common + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo +deploy_options: + containers: true + os_version: queens + sdn_controller: opendaylight + odl_version: oxygen + tacker: false + congress: false + sfc: false + vpn: false -- cgit 1.2.3-korg