Remove tripleo-operator-ansible from TQE requires
tripleo-operator-ansible will be installed from rpm from stein onwards. We no longer needs to install it from git, so removing it from TQE requires. Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com> Change-Id: I5895d482f62e88ac8fd3a2443691ace1d1c86dfb
This commit is contained in:
parent
d1deabcc4b
commit
ea6e1c2172
|
@ -80,6 +80,8 @@ repo_cmd_after: |
|
|||
|
||||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -49,3 +49,4 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
|
|
@ -79,6 +79,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -87,6 +87,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -82,6 +82,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -82,6 +82,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -101,6 +101,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1901.qcow2
|
||||
|
|
|
@ -101,6 +101,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1901.qcow2
|
||||
|
|
|
@ -130,6 +130,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
||||
# Setting base_image_url and base_image_path to overwrite DIB_LOCAL_IMAGE in
|
||||
# the diskimage-builder
|
||||
|
|
|
@ -130,6 +130,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1901.qcow2
|
||||
|
|
|
@ -153,6 +153,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1901.qcow2
|
||||
|
|
|
@ -161,6 +161,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1901.qcow2
|
||||
|
|
|
@ -122,6 +122,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
|
|
|
@ -122,6 +122,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
|
|
|
@ -122,6 +122,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
|
|
|
@ -205,6 +205,7 @@ repo_cmd_after: |
|
|||
{% endif %}
|
||||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -179,6 +179,7 @@ repo_cmd_after: |
|
|||
{% endif %}
|
||||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
tripleo-operator-ansible
|
||||
# Setting base_image_url and base_image_path to overwrite DIB_LOCAL_IMAGE in
|
||||
# the diskimage-builder
|
||||
## was https://images.rdoproject.org/base/centos7/CentOS-7-x86_64-GenericCloud-1901.qcow2 - 8 doesn't exit yet
|
||||
|
|
|
@ -186,6 +186,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# Setting base_image_url and base_image_path to overwrite DIB_LOCAL_IMAGE in
|
||||
# the diskimage-builder
|
||||
## was https://images.rdoproject.org/base/centos7/CentOS-7-x86_64-GenericCloud-1901.qcow2 - 8 doesn't exit yet
|
||||
|
|
|
@ -178,6 +178,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# Setting base_image_url and base_image_path to overwrite DIB_LOCAL_IMAGE in
|
||||
# the diskimage-builder
|
||||
## was https://images.rdoproject.org/base/centos7/CentOS-7-x86_64-GenericCloud-1901.qcow2 - 8 doesn't exit yet
|
||||
|
|
|
@ -173,6 +173,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# Setting base_image_url and base_image_path to overwrite DIB_LOCAL_IMAGE in
|
||||
# the diskimage-builder
|
||||
## was https://images.rdoproject.org/base/centos7/CentOS-7-x86_64-GenericCloud-1901.qcow2 - 8 doesn't exit yet
|
||||
|
|
|
@ -173,6 +173,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# Setting base_image_url and base_image_path to overwrite DIB_LOCAL_IMAGE in
|
||||
# the diskimage-builder
|
||||
## was https://images.rdoproject.org/base/centos7/CentOS-7-x86_64-GenericCloud-1901.qcow2 - 8 doesn't exit yet
|
||||
|
|
|
@ -204,6 +204,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# Setting base_image_url and base_image_path to overwrite DIB_LOCAL_IMAGE in
|
||||
# the diskimage-builder
|
||||
## was https://images.rdoproject.org/base/centos7/CentOS-7-x86_64-GenericCloud-1901.qcow2 - 8 doesn't exit yet
|
||||
|
|
|
@ -213,6 +213,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -204,6 +204,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -204,6 +204,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -84,6 +84,8 @@ repo_cmd_after: |
|
|||
|
||||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
tripleo-operator-ansible
|
||||
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -48,3 +48,4 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
|
|
|
@ -78,6 +78,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -85,6 +85,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -85,6 +85,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -86,6 +86,7 @@ repo_cmd_after: |
|
|||
undercloud_rpm_dependencies: >-
|
||||
python3-tripleoclient
|
||||
ceph-ansible
|
||||
tripleo-operator-ansible
|
||||
# baseos settings
|
||||
baseos_undercloud_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
|
||||
baseos_image: centos
|
||||
|
|
|
@ -7,7 +7,6 @@ git+https://opendev.org/openstack/ansible-role-python_venv_build/#egg=ansible-ro
|
|||
git+https://opendev.org/openstack/ansible-config_template/#egg=ansible-config_template
|
||||
git+https://opendev.org/openstack/ansible-role-collect-logs/#egg=ansible-role-collect-logs
|
||||
git+https://opendev.org/openstack/openstack-tempest-skiplist/#egg=openstack-tempest-skiplist
|
||||
git+https://opendev.org/openstack/tripleo-operator-ansible/#egg=tripleo-operator-ansible
|
||||
git+https://opendev.org/openstack/ansible-collections-openstack/#egg=ansible-collections-openstack.cloud
|
||||
git+https://opendev.org/openstack/tripleo-ci/#egg=tripleo-ci
|
||||
# NOTE: tripleo-ansible, tripleo-ipa are required for some jobs
|
||||
|
|
Loading…
Reference in New Issue