Skip to content

Commit

Permalink
Merge pull request #634 from stackhpc/antelope-packages
Browse files Browse the repository at this point in the history
Update package config for Antelope
  • Loading branch information
markgoddard authored Sep 13, 2023
2 parents 3ed8647 + b217e43 commit bfd3f2b
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion etc/kayobe/environments/ci-aio/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_9_openstack_zed_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_zed_version }}"
stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/environments/ci-builder/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_9_openstack_zed_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_zed_version }}"
stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_9_openstack_zed_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_zed_version }}"
stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
Expand Down
7 changes: 4 additions & 3 deletions etc/kayobe/kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ kolla_sources:
type: git
location: https://github.com/stackhpc/stackhpc-inspector-plugins.git
reference: 1.3.0
# Not yet merged: https://github.com/stackhpc/magnum/pull/139
magnum-base:
type: git
location: https://github.com/stackhpc/magnum.git
Expand Down Expand Up @@ -165,9 +166,9 @@ stackhpc_rocky_9_additional_repos:
- url: "{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_url }}"
file: "CentOS-NFV-OpenvSwitch.repo"
tag: "centos-nfv-openvswitch"
- url: "{{ stackhpc_repo_centos_stream_9_openstack_zed_url }}"
file: "CentOS-OpenStack-zed.repo"
tag: "centos-openstack-zed"
- url: "{{ stackhpc_repo_centos_stream_9_openstack_antelope_url }}"
file: "CentOS-OpenStack-antelope.repo"
tag: "centos-openstack-antelope"
- url: "{{ stackhpc_repo_centos_stream_9_opstools_url }}"
file: "CentOS-OpsTools.repo"
tag: "centos-opstools"
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/pulp-repo-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Do not edit! This file is autogenerated by Ansible.
stackhpc_pulp_repo_centos_stream_9_docker_version: 20230228T044432
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20230510T072502
stackhpc_pulp_repo_centos_stream_9_openstack_zed_version: 20230721T005746
stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20230912T101324
stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230301T034123
stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20230712T025152
stackhpc_pulp_repo_epel_9_version: 20230302T031902
Expand Down
8 changes: 4 additions & 4 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,10 @@ stackhpc_pulp_rpm_repos:
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"


- name: CentOS Stream 9 - OpenStack Zed
url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-zed/{{ stackhpc_pulp_repo_centos_stream_9_openstack_zed_version }}"
distribution_name: "centos-stream-9-openstack-zed-"
base_path: "centos/9-stream/cloud/x86_64/openstack-zed/"
- name: CentOS Stream 9 - OpenStack Antelope
url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-antelope/{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
distribution_name: "centos-stream-9-openstack-antelope-"
base_path: "centos/9-stream/cloud/x86_64/openstack-antelope/"
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"

- name: CentOS 9 - OpsTools - collectd
Expand Down

0 comments on commit bfd3f2b

Please sign in to comment.