diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-08-13 14:51:09 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-08-14 15:38:59 -0400 |
| commit | ae5fcc0dd1d19c750cba8d9bf16545f5a7802287 (patch) | |
| tree | 8bd9601966ded90b63373ccaa3ac3993d21beffa /config | |
| parent | c5959cc14b95e9d10b78ebf3c8e2525c672fc0c7 (diff) | |
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>
Diffstat (limited to 'config')
| -rw-r--r-- | config/deploy/common-patches.yaml | 8 | ||||
| -rw-r--r-- | config/deploy/os-nosdn-nofeature-ha.yaml | 4 | ||||
| -rw-r--r-- | config/deploy/os-nosdn-nofeature-noha.yaml | 4 | ||||
| -rw-r--r-- | config/deploy/os-odl-nofeature-ha.yaml | 3 | ||||
| -rw-r--r-- | config/deploy/os-odl-nofeature-noha.yaml | 3 |
5 files changed, 8 insertions, 14 deletions
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 diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml index d642533b..26d30e5e 100644 --- a/config/deploy/os-nosdn-nofeature-ha.yaml +++ b/config/deploy/os-nosdn-nofeature-ha.yaml @@ -1,10 +1,6 @@ --- global_params: ha_enabled: true - patches: - undercloud: - - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 - project: openstack/tripleo-common deploy_options: containers: true os_version: master diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml index 41b9ec72..e7758113 100644 --- a/config/deploy/os-nosdn-nofeature-noha.yaml +++ b/config/deploy/os-nosdn-nofeature-noha.yaml @@ -1,10 +1,6 @@ --- global_params: ha_enabled: false - patches: - undercloud: - - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 - project: openstack/tripleo-common deploy_options: containers: true os_version: master diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml index a46b4849..a1f0d81e 100644 --- a/config/deploy/os-odl-nofeature-ha.yaml +++ b/config/deploy/os-odl-nofeature-ha.yaml @@ -2,9 +2,6 @@ global_params: ha_enabled: true patches: - undercloud: - - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 - project: openstack/tripleo-common overcloud: - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 project: openstack/puppet-tripleo diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml index 609a03da..55f14426 100644 --- a/config/deploy/os-odl-nofeature-noha.yaml +++ b/config/deploy/os-odl-nofeature-noha.yaml @@ -2,9 +2,6 @@ global_params: ha_enabled: false patches: - undercloud: - - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 - project: openstack/tripleo-common overcloud: - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 project: openstack/puppet-tripleo |