Allow common patches file 09/60909/7
authorTim Rozet <trozet@redhat.com>
Mon, 13 Aug 2018 18:51:09 +0000 (14:51 -0400)
committerTim Rozet <trozet@redhat.com>
Tue, 14 Aug 2018 19:38:59 +0000 (15:38 -0400)
commitae5fcc0dd1d19c750cba8d9bf16545f5a7802287
tree8bd9601966ded90b63373ccaa3ac3993d21beffa
parentc5959cc14b95e9d10b78ebf3c8e2525c672fc0c7
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 <trozet@redhat.com>
15 files changed:
apex/common/utils.py
apex/deploy.py
apex/deployment/__init__.py [new file with mode: 0644]
apex/deployment/tripleo.py [new file with mode: 0644]
apex/tests/config/common-patches.yaml [new file with mode: 0644]
apex/tests/config/dummy-deploy-settings.yaml [new file with mode: 0644]
apex/tests/test_apex_common_utils.py
apex/tests/test_apex_deploy.py
apex/tests/test_apex_deployment_tripleo.py [new file with mode: 0644]
build/rpm_specs/opnfv-apex.spec
config/deploy/common-patches.yaml [new file with mode: 0644]
config/deploy/os-nosdn-nofeature-ha.yaml
config/deploy/os-nosdn-nofeature-noha.yaml
config/deploy/os-odl-nofeature-ha.yaml
config/deploy/os-odl-nofeature-noha.yaml