Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions ansible/inventory/group_vars/all/dev-pulp-repos
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}"
Expand Down Expand Up @@ -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 }}"
Expand Down
1 change: 1 addition & 0 deletions ansible/inventory/group_vars/all/test-pulp-repo-versions
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 12 additions & 14 deletions ansible/inventory/group_vars/all/test-pulp-repos
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down Expand Up @@ -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 }}"
Expand Down