From 0cc4c5b302558b4894aeb2ebe8073e1903ee0493 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 10 Dec 2021 13:39:37 +0000 Subject: [PATCH] Enable CentOS Stream 8 Storage SIG Ceph Pacific repo --- .../inventory/group_vars/all/dev-pulp-repos | 17 ++++++------ .../group_vars/all/test-pulp-repo-versions | 1 + .../inventory/group_vars/all/test-pulp-repos | 26 +++++++++---------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/ansible/inventory/group_vars/all/dev-pulp-repos b/ansible/inventory/group_vars/all/dev-pulp-repos index 7dcd4dc4..35c6e735 100644 --- a/ansible/inventory/group_vars/all/dev-pulp-repos +++ b/ansible/inventory/group_vars/all/dev-pulp-repos @@ -23,12 +23,11 @@ dev_pulp_repository_rpm_repos: policy: immediate sync_policy: mirror_complete state: present - # Note(piotrp): Assuming we'd need this in the future - name: CentOS Stream 8 - Ceph Pacific url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&repo=storage-ceph-pacific policy: immediate sync_policy: mirror_complete - state: absent + state: present - name: CentOS Stream 8 - NFV OpenvSwitch url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&repo=nfv-openvswitch-2 policy: immediate @@ -137,6 +136,7 @@ dev_pulp_repo_centos_stream_8_extras_version: "{{ test_pulp_repo_centos_stream_8 dev_pulp_repo_centos_stream_8_nfv_openvswitch_version: "{{ test_pulp_repo_centos_stream_8_nfv_openvswitch_version if dev_pulp_distribution_promote | bool else dev_pulp_distribution_version }}" dev_pulp_repo_centos_stream_8_openstack_wallaby_version: "{{ test_pulp_repo_centos_stream_8_openstack_wallaby_version if dev_pulp_distribution_promote | bool else dev_pulp_distribution_version }}" dev_pulp_repo_centos_stream_8_powertools_version: "{{ test_pulp_repo_centos_stream_8_powertools_version if dev_pulp_distribution_promote | bool else dev_pulp_distribution_version }}" +dev_pulp_repo_centos_stream_8_storage_ceph_pacific_version: "{{ test_pulp_repo_centos_stream_8_storage_ceph_pacific_version if dev_pulp_distribution_promote | bool else dev_pulp_distribution_version }}" dev_pulp_repo_docker_version: "{{ test_pulp_repo_docker_version if dev_pulp_distribution_promote | bool else dev_pulp_distribution_version }}" dev_pulp_repo_elasticsearch_logstash_kibana_7_x_version: "{{ test_pulp_repo_elasticsearch_logstash_kibana_7_x_version if dev_pulp_distribution_promote | bool else dev_pulp_distribution_version }}" dev_pulp_repo_epel_modular_version: "{{ test_pulp_repo_epel_modular_version if dev_pulp_distribution_promote | bool else dev_pulp_distribution_version }}" @@ -177,13 +177,12 @@ dev_pulp_distribution_rpm: content_guard: "{{ dev_pulp_distribution_content_guard }}" state: present short_name: centos_stream_8_advanced_virtualization - # Note(piotrp): Assuming we'd need this in the future - # - name: "centos-stream-8-storage-ceph-pacific-{{ dev_pulp_repo_centos_8_storage_ceph_pacific_version }}" - # repository: CentOS Stream 8 - Ceph Pacific - # base_path: "centos/8-stream/storage/x86_64/ceph-pacific/{{ dev_pulp_repo_centos_8_storage_ceph_pacific_version }}" - # content_guard: "{{ dev_pulp_distribution_content_guard }}" - # state: present - # short_name: centos_stream_8_storage_ceph_pacific + - name: "centos-stream-8-storage-ceph-pacific-{{ dev_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" + repository: CentOS Stream 8 - Ceph Pacific + base_path: "centos/8-stream/storage/x86_64/ceph-pacific/{{ dev_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" + content_guard: "{{ dev_pulp_distribution_content_guard }}" + state: present + short_name: centos_stream_8_storage_ceph_pacific - name: "centos-stream-8-nfv-openvswitch-{{ dev_pulp_repo_centos_stream_8_nfv_openvswitch_version }}" repository: CentOS Stream 8 - NFV OpenvSwitch base_path: "centos/8-stream/nfv/x86_64/openvswitch-2/{{ dev_pulp_repo_centos_stream_8_nfv_openvswitch_version }}" diff --git a/ansible/inventory/group_vars/all/test-pulp-repo-versions b/ansible/inventory/group_vars/all/test-pulp-repo-versions index dc66384f..bedaa1ae 100644 --- a/ansible/inventory/group_vars/all/test-pulp-repo-versions +++ b/ansible/inventory/group_vars/all/test-pulp-repo-versions @@ -9,6 +9,7 @@ test_pulp_repo_centos_stream_8_extras_version: 20211122T102435 test_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20211122T102435 test_pulp_repo_centos_stream_8_openstack_wallaby_version: 20211122T102435 test_pulp_repo_centos_stream_8_powertools_version: 20211122T102435 +test_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20211210T124731 test_pulp_repo_docker_version: 20211122T102435 test_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20211122T102435 test_pulp_repo_epel_modular_version: 20211122T102435 diff --git a/ansible/inventory/group_vars/all/test-pulp-repos b/ansible/inventory/group_vars/all/test-pulp-repos index d1d29f6d..eb6ff923 100644 --- a/ansible/inventory/group_vars/all/test-pulp-repos +++ b/ansible/inventory/group_vars/all/test-pulp-repos @@ -40,14 +40,13 @@ test_pulp_repository_rpm_repos: policy: on_demand sync_policy: mirror_complete state: present - # Note(piotrp): Assuming we'd need this in the future - # - name: CentOS Stream 8 - Ceph Pacific (ark) - # url: "{{ test_dev_pulp_content_url }}/centos/8-stream/storage/x86_64/ceph-pacific/{{ test_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" - # client_cert: "{{ test_client_cert }}" - # client_key: "{{ test_client_key }}" - # policy: on_demand - # sync_policy: mirror_complete - # state: present + - name: CentOS Stream 8 - Ceph Pacific (ark) + url: "{{ test_dev_pulp_content_url }}/centos/8-stream/storage/x86_64/ceph-pacific/{{ test_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" + client_cert: "{{ test_client_cert }}" + client_key: "{{ test_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present - name: CentOS Stream 8 - NFV OpenvSwitch (ark) url: "{{ test_dev_pulp_content_url }}/centos/8-stream/nfv/x86_64/openvswitch-2/{{ test_pulp_repo_centos_stream_8_nfv_openvswitch_version }}" client_cert: "{{ test_client_cert }}" @@ -182,12 +181,11 @@ test_pulp_distribution_rpm: base_path: "centos/8-stream/virt/x86_64/advancedvirt-common/{{ test_pulp_repo_centos_stream_8_advanced_virtualization_version }}" state: present short_name: centos_stream_8_advanced_virtualization - # Note(piotrp): Assuming we'd need this in the future - # - name: "centos-stream-8-storage-ceph-pacific-{{ test_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}-ark" - # repository: CentOS Stream 8 - Ceph Pacific (ark) - # base_path: "centos/8-stream/storage/x86_64/ceph-pacific/{{ test_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" - # state: present - # short_name: centos_stream_8_storage_ceph_pacific + - name: "centos-stream-8-storage-ceph-pacific-{{ test_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}-ark" + repository: CentOS Stream 8 - Ceph Pacific (ark) + base_path: "centos/8-stream/storage/x86_64/ceph-pacific/{{ test_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" + state: present + short_name: centos_stream_8_storage_ceph_pacific - name: "centos-stream-8-nfv-openvswitch-{{ test_pulp_repo_centos_stream_8_nfv_openvswitch_version }}-ark" repository: CentOS Stream 8 - NFV OpenvSwitch (ark) base_path: "centos/8-stream/nfv/x86_64/openvswitch-2/{{ test_pulp_repo_centos_stream_8_nfv_openvswitch_version }}"