From f221efde41e5023e0e0050d9e9d72e2e3028897f Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 19 Feb 2024 22:39:47 +0100 Subject: [PATCH] fix upgrade Signed-off-by: Guillaume Abrioux --- Vagrantfile | 4 +- group_vars/all.yml.sample | 2 +- infrastructure-playbooks/rolling_update.yml | 2 + roles/ceph-defaults/defaults/main.yml | 2 +- .../add-mdss/container/group_vars/all | 2 +- .../add-mgrs/container/group_vars/all | 2 +- tests/functional/add-mgrs/group_vars/all | 2 +- .../add-mons/container/group_vars/all | 2 +- tests/functional/add-mons/group_vars/all | 2 +- .../add-osds/container/group_vars/all | 2 +- .../add-rbdmirrors/container/group_vars/all | 2 +- .../add-rgws/container/group_vars/all | 2 +- .../all-in-one/container/group_vars/all | 2 +- .../all_daemons/container/group_vars/all | 2 +- .../all_daemons_ipv6/container/group_vars/all | 2 +- .../all_daemons_ipv6/group_vars/all | 2 +- tests/functional/cephadm/group_vars/all | 2 +- .../collocation/container/group_vars/all | 2 +- tests/functional/docker2podman/group_vars/all | 2 +- .../container/inventory/group_vars/all | 2 +- .../container/group_vars/all | 4 +- .../lvm-batch/container/group_vars/all | 2 +- .../lvm-osds/container/group_vars/all | 2 +- tests/functional/podman/group_vars/all | 2 +- .../rbdmirror/container/group_vars/all | 2 +- .../container/secondary/group_vars/all | 2 +- .../shrink_mds/container/group_vars/all | 2 +- .../shrink_mgr/container/group_vars/all | 2 +- tests/functional/shrink_mgr/group_vars/all | 2 +- .../shrink_mon/container/group_vars/all | 2 +- .../shrink_osd/container/group_vars/all | 2 +- .../shrink_rbdmirror/container/group_vars/all | 2 +- .../shrink_rgw/container/group_vars/all | 2 +- tests/functional/shrink_rgw/group_vars/all | 2 +- .../subset_update/container/group_vars/all | 2 +- tests/functional/subset_update/group_vars/all | 2 +- tox-subset_update.ini | 17 -------- tox-update.ini | 39 +++++++++---------- tox.ini | 1 - 39 files changed, 58 insertions(+), 75 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index dde4b3089..e8503f19d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -25,8 +25,8 @@ GRAFANA = settings['grafana_server_vms'] NRBD_MIRRORS = settings['rbd_mirror_vms'] CLIENTS = settings['client_vms'] MGRS = settings['mgr_vms'] -PUBLIC_SUBNET = settings['public_subnet'] -CLUSTER_SUBNET = settings['cluster_subnet'] +PUBLIC_SUBNET = ENV['CEPH_PUBLIC_SUBNET'] || settings['public_subnet'] +CLUSTER_SUBNET = ENV['CEPH_CLUSTER_SUBNET'] || settings['cluster_subnet'] BOX = ENV['CEPH_ANSIBLE_VAGRANT_BOX'] || settings['vagrant_box'] CLIENT_BOX = ENV['CEPH_ANSIBLE_VAGRANT_BOX'] || settings['client_vagrant_box'] || BOX BOX_URL = ENV['CEPH_ANSIBLE_VAGRANT_BOX_URL'] || settings['vagrant_box_url'] diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 94c838984..4fd199fa0 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -519,7 +519,7 @@ dummy: # DOCKER # ########## #ceph_docker_image: "ceph/daemon-base" -#ceph_docker_image_tag: latest-main +#ceph_docker_image_tag: latest-reef #ceph_docker_registry: quay.io #ceph_docker_registry_auth: false # ceph_docker_registry_username: diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index c57be0a56..4c5be64fc 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -1173,6 +1173,7 @@ ansible.builtin.systemd: name: "{{ 'ceph-exporter@' + ansible_facts['hostname'] if containerized_deployment | bool else 'ceph-exporter.service' }}" state: stopped + ignore_errors: true # it needs to be done in a separate task otherwise the stop just before doesn't work. - name: Mask and disable the ceph-exporter service @@ -1180,6 +1181,7 @@ name: "{{ 'ceph-exporter@' + ansible_facts['hostname'] if containerized_deployment | bool else 'ceph-exporter.service' }}" enabled: false masked: true + ignore_errors: true - name: Import ceph-defaults role ansible.builtin.import_role: diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index bd01a91ec..b2c67eb30 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -511,7 +511,7 @@ ceph_tcmalloc_max_total_thread_cache: 134217728 # DOCKER # ########## ceph_docker_image: "ceph/daemon-base" -ceph_docker_image_tag: latest-main +ceph_docker_image_tag: latest-reef ceph_docker_registry: quay.io ceph_docker_registry_auth: false # ceph_docker_registry_username: diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all index abacaac81..3634d9c4d 100644 --- a/tests/functional/add-mdss/container/group_vars/all +++ b/tests/functional/add-mdss/container/group_vars/all @@ -29,4 +29,4 @@ ceph_conf_overrides: dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all index 34065af17..a1928da90 100644 --- a/tests/functional/add-mgrs/container/group_vars/all +++ b/tests/functional/add-mgrs/container/group_vars/all @@ -29,4 +29,4 @@ ceph_conf_overrides: dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/add-mgrs/group_vars/all b/tests/functional/add-mgrs/group_vars/all index fb9bde0f0..f9fe36762 100644 --- a/tests/functional/add-mgrs/group_vars/all +++ b/tests/functional/add-mgrs/group_vars/all @@ -1,6 +1,6 @@ --- ceph_origin: repository -ceph_repository: dev +ceph_repository: community cluster: ceph public_network: "192.168.73.0/24" cluster_network: "192.168.74.0/24" diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all index 1fff68805..0ad0cf8b2 100644 --- a/tests/functional/add-mons/container/group_vars/all +++ b/tests/functional/add-mons/container/group_vars/all @@ -29,4 +29,4 @@ ceph_conf_overrides: dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/add-mons/group_vars/all b/tests/functional/add-mons/group_vars/all index 7988877c0..5ac44e7bb 100644 --- a/tests/functional/add-mons/group_vars/all +++ b/tests/functional/add-mons/group_vars/all @@ -1,6 +1,6 @@ --- ceph_origin: repository -ceph_repository: dev +ceph_repository: community cluster: ceph public_network: "192.168.53.0/24" cluster_network: "192.168.54.0/24" diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all index 39022d7a6..66204470e 100644 --- a/tests/functional/add-osds/container/group_vars/all +++ b/tests/functional/add-osds/container/group_vars/all @@ -29,4 +29,4 @@ ceph_conf_overrides: dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all index c275d4f08..ba66d50e6 100644 --- a/tests/functional/add-rbdmirrors/container/group_vars/all +++ b/tests/functional/add-rbdmirrors/container/group_vars/all @@ -29,4 +29,4 @@ ceph_conf_overrides: dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all index 1de1eea6f..b73463fc8 100644 --- a/tests/functional/add-rgws/container/group_vars/all +++ b/tests/functional/add-rgws/container/group_vars/all @@ -31,4 +31,4 @@ rgw_bucket_default_quota_max_objects: 1638400 dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all index daa915a65..1638ca1f8 100644 --- a/tests/functional/all-in-one/container/group_vars/all +++ b/tests/functional/all-in-one/container/group_vars/all @@ -45,4 +45,4 @@ lvm_volumes: db_vg: journals ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index 6dfcb137c..ec16b0504 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -38,7 +38,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B! grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main +ceph_docker_image_tag: latest-reef node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" diff --git a/tests/functional/all_daemons_ipv6/container/group_vars/all b/tests/functional/all_daemons_ipv6/container/group_vars/all index d0c9ee6bc..c9347c8b0 100644 --- a/tests/functional/all_daemons_ipv6/container/group_vars/all +++ b/tests/functional/all_daemons_ipv6/container/group_vars/all @@ -39,7 +39,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B! grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main +ceph_docker_image_tag: latest-reef node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" diff --git a/tests/functional/all_daemons_ipv6/group_vars/all b/tests/functional/all_daemons_ipv6/group_vars/all index 204219f19..aa5b93f66 100644 --- a/tests/functional/all_daemons_ipv6/group_vars/all +++ b/tests/functional/all_daemons_ipv6/group_vars/all @@ -1,6 +1,6 @@ --- ceph_origin: repository -ceph_repository: dev +ceph_repository: community ip_version: ipv6 public_network: "fdec:f1fb:29cd:6940::/64" cluster_network: "fdec:f1fb:29cd:7120::/64" diff --git a/tests/functional/cephadm/group_vars/all b/tests/functional/cephadm/group_vars/all index 2e074a271..5ae26fe20 100644 --- a/tests/functional/cephadm/group_vars/all +++ b/tests/functional/cephadm/group_vars/all @@ -5,5 +5,5 @@ cluster_network: "192.168.31.0/24" dashboard_admin_password: $sX!cD$rYU6qR^B! ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main-devel +ceph_docker_image_tag: latest-reef-devel containerized_deployment: true diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all index e6f0fab1e..9f885ff9e 100644 --- a/tests/functional/collocation/container/group_vars/all +++ b/tests/functional/collocation/container/group_vars/all @@ -27,7 +27,7 @@ dashboard_admin_user_ro: true grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main +ceph_docker_image_tag: latest-reef node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all index 42e97ffd8..1d70ba673 100644 --- a/tests/functional/docker2podman/group_vars/all +++ b/tests/functional/docker2podman/group_vars/all @@ -35,7 +35,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B! grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main +ceph_docker_image_tag: latest-reef node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all index 940a55ff8..5062e82da 100644 --- a/tests/functional/external_clients/container/inventory/group_vars/all +++ b/tests/functional/external_clients/container/inventory/group_vars/all @@ -39,4 +39,4 @@ fsid: 40358a87-ab6e-4bdc-83db-1d909147861c generate_fsid: false ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all index dab885f7a..e560b6eb0 100644 --- a/tests/functional/lvm-auto-discovery/container/group_vars/all +++ b/tests/functional/lvm-auto-discovery/container/group_vars/all @@ -6,7 +6,7 @@ docker: True containerized_deployment: True ceph_origin: repository -ceph_repository: dev +ceph_repository: community cluster: ceph public_network: "192.168.39.0/24" cluster_network: "192.168.40.0/24" @@ -29,4 +29,4 @@ handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all index a3e868dd3..6102398cc 100644 --- a/tests/functional/lvm-batch/container/group_vars/all +++ b/tests/functional/lvm-batch/container/group_vars/all @@ -29,4 +29,4 @@ handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all index 5e812e355..f810f6a31 100644 --- a/tests/functional/lvm-osds/container/group_vars/all +++ b/tests/functional/lvm-osds/container/group_vars/all @@ -38,4 +38,4 @@ openstack_pools: - "{{ openstack_cinder_pool }}" ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all index 6101343ec..ed28d4acd 100644 --- a/tests/functional/podman/group_vars/all +++ b/tests/functional/podman/group_vars/all @@ -34,7 +34,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B! grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main +ceph_docker_image_tag: latest-reef node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" diff --git a/tests/functional/rbdmirror/container/group_vars/all b/tests/functional/rbdmirror/container/group_vars/all index 54924683c..8ce9d0c9b 100644 --- a/tests/functional/rbdmirror/container/group_vars/all +++ b/tests/functional/rbdmirror/container/group_vars/all @@ -29,4 +29,4 @@ ceph_conf_overrides: dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main +ceph_docker_image_tag: latest-reef diff --git a/tests/functional/rbdmirror/container/secondary/group_vars/all b/tests/functional/rbdmirror/container/secondary/group_vars/all index ccc55d1cf..d724111dc 100644 --- a/tests/functional/rbdmirror/container/secondary/group_vars/all +++ b/tests/functional/rbdmirror/container/secondary/group_vars/all @@ -29,4 +29,4 @@ ceph_conf_overrides: dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main +ceph_docker_image_tag: latest-reef diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all index 43f2de24d..f56d60095 100644 --- a/tests/functional/shrink_mds/container/group_vars/all +++ b/tests/functional/shrink_mds/container/group_vars/all @@ -18,4 +18,4 @@ dashboard_enabled: False copy_admin_key: True ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all index 5488b6c41..af8ede0f0 100644 --- a/tests/functional/shrink_mgr/container/group_vars/all +++ b/tests/functional/shrink_mgr/container/group_vars/all @@ -17,4 +17,4 @@ openstack_config: False dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/shrink_mgr/group_vars/all b/tests/functional/shrink_mgr/group_vars/all index bc72091a1..83913110d 100644 --- a/tests/functional/shrink_mgr/group_vars/all +++ b/tests/functional/shrink_mgr/group_vars/all @@ -1,6 +1,6 @@ --- ceph_origin: repository -ceph_repository: dev +ceph_repository: community public_network: "192.168.81.0/24" cluster_network: "192.168.82.0/24" monitor_interface: eth1 diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all index 2fd03e9b5..8943db19d 100644 --- a/tests/functional/shrink_mon/container/group_vars/all +++ b/tests/functional/shrink_mon/container/group_vars/all @@ -17,4 +17,4 @@ openstack_config: False dashboard_enabled: False ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all index 9e6f481b8..6bd2e2863 100644 --- a/tests/functional/shrink_osd/container/group_vars/all +++ b/tests/functional/shrink_osd/container/group_vars/all @@ -18,4 +18,4 @@ dashboard_enabled: False copy_admin_key: True ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all index 7eeffe266..5950e49ab 100644 --- a/tests/functional/shrink_rbdmirror/container/group_vars/all +++ b/tests/functional/shrink_rbdmirror/container/group_vars/all @@ -17,4 +17,4 @@ dashboard_enabled: False copy_admin_key: True ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all index 052f9ffc9..8d23ef36f 100644 --- a/tests/functional/shrink_rgw/container/group_vars/all +++ b/tests/functional/shrink_rgw/container/group_vars/all @@ -19,4 +19,4 @@ dashboard_enabled: False copy_admin_key: True ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main \ No newline at end of file +ceph_docker_image_tag: latest-reef \ No newline at end of file diff --git a/tests/functional/shrink_rgw/group_vars/all b/tests/functional/shrink_rgw/group_vars/all index f67e92154..e2a45402f 100644 --- a/tests/functional/shrink_rgw/group_vars/all +++ b/tests/functional/shrink_rgw/group_vars/all @@ -1,6 +1,6 @@ --- ceph_origin: repository -ceph_repository: dev +ceph_repository: community public_network: "192.168.89.0/24" cluster_network: "192.168.90.0/24" monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}" diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all index 4b8941b96..410686af9 100644 --- a/tests/functional/subset_update/container/group_vars/all +++ b/tests/functional/subset_update/container/group_vars/all @@ -29,7 +29,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B! grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon-base -ceph_docker_image_tag: latest-main +ceph_docker_image_tag: latest-reef node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" diff --git a/tests/functional/subset_update/group_vars/all b/tests/functional/subset_update/group_vars/all index 03d44a831..13725dd32 100644 --- a/tests/functional/subset_update/group_vars/all +++ b/tests/functional/subset_update/group_vars/all @@ -1,6 +1,6 @@ --- ceph_origin: repository -ceph_repository: dev +ceph_repository: community public_network: "192.168.3.0/24" cluster_network: "192.168.4.0/24" radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}" diff --git a/tox-subset_update.ini b/tox-subset_update.ini index c7c53e2f1..fe814898c 100644 --- a/tox-subset_update.ini +++ b/tox-subset_update.ini @@ -42,12 +42,9 @@ commands= ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml - non_container: ansible-playbook -vv --diff -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ yes_i_know=true \ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -57,8 +54,6 @@ commands= # mon1 ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit mon1 --tags=mons --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -66,8 +61,6 @@ commands= # mon0 and mon2 ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit 'mons:!mon1' --tags=mons --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -75,8 +68,6 @@ commands= # upgrade mgrs ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --tags=mgrs --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -84,8 +75,6 @@ commands= # upgrade osd1 ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit=osd1 --tags=osds --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -93,8 +82,6 @@ commands= # upgrade remaining osds (serially) ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit='osds:!osd1' --tags=osds --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -102,8 +89,6 @@ commands= # upgrade rgws ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --tags=rgws --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -111,8 +96,6 @@ commands= # post upgrade actions ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --tags=post_upgrade --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ diff --git a/tox-update.ini b/tox-update.ini index 5911bf81f..33b67502a 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -11,7 +11,7 @@ allowlist_externals = pip passenv=* setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey + ANSIBLE_SSH_ARGS = -F {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_COLLECTIONS_PATH = {envdir}/ansible_collections ANSIBLE_CONFIG = {toxinidir}/ansible.cfg ANSIBLE_CALLBACK_ENABLED = profile_tasks @@ -36,42 +36,41 @@ setenv= deps= -r{toxinidir}/tests/requirements.txt changedir={toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} commands= - bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox} - bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} + # use the stable-7.0 branch to deploy an octopus cluster + git clone -b stable-7.0 --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible - ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections + bash {envdir}/tmp/ceph-ansible/tests/scripts/vagrant_up.sh {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:} --no-provision {posargs:--provider=virtualbox} + bash {envdir}/tmp/ceph-ansible/tests/scripts/generate_ssh_config.sh {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:} + + ansible-galaxy collection install -r {envdir}/tmp/ceph-ansible/requirements.yml -v -p {envdir}/ansible_collections - ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml + ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/setup.yml -# # use the stable-7.0 branch to deploy an octopus cluster -# git clone -b stable-7.0 --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible -# pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt -# bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/setup.yml' -# # configure lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file) -# bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml --extra-vars "osd_scenario=lvm"' + pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt + bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/setup.yml' + # configure lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file) + bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml --extra-vars "osd_scenario=lvm" --limit 'osds:!osd2'' # configure lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file) ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osds:!osd2' - non_container: ansible-playbook -vv --diff -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" - ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ yes_i_know=true \ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ + container_package_name=podman \ + container_service_name=podman \ + container_binary=podman \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ " -# pip uninstall -y ansible -# pip install -r {toxinidir}/tests/requirements.txt -# ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections + pip uninstall -y ansible + pip install -r {toxinidir}/tests/requirements.txt + ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ diff --git a/tox.ini b/tox.ini index 08bfeb18b..264223d45 100644 --- a/tox.ini +++ b/tox.ini @@ -328,7 +328,6 @@ changedir= commands= ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections - non_container: ansible-playbook -vv --diff -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} -- 2.39.5