osd: drop openstack related tasks

All of this should be addressed in custom separate playbooks if needed.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 77d3536d1d2d46a8d05f0023809fe51e87d77484..c146cdbb0760cdf9e743263ff473cd418f654471 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -554,64 +554,6 @@ dummy:
 #docker_pull_timeout: "300s"
 
 
-#############
-# OPENSTACK #
-#############
-#openstack_config: false
-# When pg_autoscale_mode is set to True, you must add the target_size_ratio key with a correct value
-# `pg_num` and `pgp_num` keys will be ignored, even if specified.
-# eg:
-#  openstack_glance_pool:
-#    name: "images"
-#    rule_name: "my_replicated_rule"
-#    application: "rbd"
-#    pg_autoscale_mode: false
-#    pg_num: 16
-#    pgp_num: 16
-#    target_size_ratio: 0.2
-#openstack_glance_pool:
-#  name: "images"
-#  application: "rbd"
-#openstack_cinder_pool:
-#  name: "volumes"
-#  application: "rbd"
-#openstack_nova_pool:
-#  name: "vms"
-#  application: "rbd"
-#openstack_cinder_backup_pool:
-#  name: "backups"
-#  application: "rbd"
-#openstack_gnocchi_pool:
-#  name: "metrics"
-#  application: "rbd"
-#openstack_cephfs_data_pool:
-#  name: "manila_data"
-#  application: "cephfs"
-#openstack_cephfs_metadata_pool:
-#  name: "manila_metadata"
-#  application: "cephfs"
-#openstack_pools:
-#  - "{{ openstack_glance_pool }}"
-#  - "{{ openstack_cinder_pool }}"
-#  - "{{ openstack_nova_pool }}"
-#  - "{{ openstack_cinder_backup_pool }}"
-#  - "{{ openstack_gnocchi_pool }}"
-#  - "{{ openstack_cephfs_data_pool }}"
-#  - "{{ openstack_cephfs_metadata_pool }}"
-
-
-# The value for 'key' can be a pre-generated key,
-# e.g key: "AQDC2UxZH4yeLhAAgTaZb+4wDUlYOsr1OfZSpQ=="
-# By default, keys will be auto-generated.
-#
-#openstack_keys:
-#  - { name: client.glance, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_glance_pool.name }}"}, mode: "0600" }
-#  - { name: client.cinder, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_nova_pool.name }}, profile rbd pool={{ openstack_glance_pool.name }}"}, mode: "0600" }
-#  - { name: client.cinder-backup, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_cinder_backup_pool.name }}"}, mode: "0600" }
-#  - { name: client.gnocchi, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_gnocchi_pool.name }}"}, mode: "0600", }
-#  - { name: client.openstack, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_glance_pool.name }}, profile rbd pool={{ openstack_nova_pool.name }}, profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_cinder_backup_pool.name }}"}, mode: "0600" }
-
-
 #############
 # DASHBOARD #
 #############

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 79ef487dee70d446c879b7d72b0e67b9f1ef10d3..a6ff3229d84869f440a5faae2bcaa005281ff4e2 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -546,64 +546,6 @@ docker_pull_retry: 3
 docker_pull_timeout: "300s"
 
 
-#############
-# OPENSTACK #
-#############
-openstack_config: false
-# When pg_autoscale_mode is set to True, you must add the target_size_ratio key with a correct value
-# `pg_num` and `pgp_num` keys will be ignored, even if specified.
-# eg:
-#  openstack_glance_pool:
-#    name: "images"
-#    rule_name: "my_replicated_rule"
-#    application: "rbd"
-#    pg_autoscale_mode: false
-#    pg_num: 16
-#    pgp_num: 16
-#    target_size_ratio: 0.2
-openstack_glance_pool:
-  name: "images"
-  application: "rbd"
-openstack_cinder_pool:
-  name: "volumes"
-  application: "rbd"
-openstack_nova_pool:
-  name: "vms"
-  application: "rbd"
-openstack_cinder_backup_pool:
-  name: "backups"
-  application: "rbd"
-openstack_gnocchi_pool:
-  name: "metrics"
-  application: "rbd"
-openstack_cephfs_data_pool:
-  name: "manila_data"
-  application: "cephfs"
-openstack_cephfs_metadata_pool:
-  name: "manila_metadata"
-  application: "cephfs"
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
-  - "{{ openstack_nova_pool }}"
-  - "{{ openstack_cinder_backup_pool }}"
-  - "{{ openstack_gnocchi_pool }}"
-  - "{{ openstack_cephfs_data_pool }}"
-  - "{{ openstack_cephfs_metadata_pool }}"
-
-
-# The value for 'key' can be a pre-generated key,
-# e.g key: "AQDC2UxZH4yeLhAAgTaZb+4wDUlYOsr1OfZSpQ=="
-# By default, keys will be auto-generated.
-#
-openstack_keys:
-  - { name: client.glance, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_glance_pool.name }}"}, mode: "0600" }
-  - { name: client.cinder, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_nova_pool.name }}, profile rbd pool={{ openstack_glance_pool.name }}"}, mode: "0600" }
-  - { name: client.cinder-backup, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_cinder_backup_pool.name }}"}, mode: "0600" }
-  - { name: client.gnocchi, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_gnocchi_pool.name }}"}, mode: "0600", }
-  - { name: client.openstack, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_glance_pool.name }}, profile rbd pool={{ openstack_nova_pool.name }}, profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_cinder_backup_pool.name }}"}, mode: "0600" }
-
-
 #############
 # DASHBOARD #
 #############

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index f51fc984594cdff63db6df1dd840085592e51b5e..8987f57cfc99bae57e7351c7a52cc6a9303276e9 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -99,13 +99,3 @@
   ansible.builtin.include_tasks: crush_rules.yml
   when: hostvars[groups[mon_group_name][0]]['crush_rule_config'] | default(crush_rule_config) | bool
   tags: wait_all_osds_up
-
-# Create the pools listed in openstack_pools
-- name: Include openstack_config.yml
-  ansible.builtin.include_tasks: openstack_config.yml
-  when:
-    - not add_osd | bool
-    - not rolling_update | default(False) | bool
-    - openstack_config | bool
-    - inventory_hostname == groups[osd_group_name] | last
-  tags: wait_all_osds_up

diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml
deleted file mode 100644 (file)
index 6b276c2..0000000
--- a/roles/ceph-osd/tasks/openstack_config.yml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- name: Pool related tasks
-  block:
-    - name: Create openstack pool(s)
-      ceph_pool:
-        name: "{{ item.name }}"
-        cluster: "{{ cluster }}"
-        pg_num: "{{ item.pg_num | default(omit) }}"
-        pgp_num: "{{ item.pgp_num | default(omit) }}"
-        size: "{{ item.size | default(omit) }}"
-        min_size: "{{ item.min_size | default(omit) }}"
-        pool_type: "{{ item.type | default('replicated') }}"
-        rule_name: "{{ item.rule_name | default(omit) }}"
-        erasure_profile: "{{ item.erasure_profile | default(omit) }}"
-        pg_autoscale_mode: "{{ item.pg_autoscale_mode | default(omit) }}"
-        target_size_ratio: "{{ item.target_size_ratio | default(omit) }}"
-        application: "{{ item.application | default(omit) }}"
-      with_items: "{{ openstack_pools }}"
-      delegate_to: "{{ groups[mon_group_name][0] }}"
-      environment:
-        CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}"
-        CEPH_CONTAINER_BINARY: "{{ container_binary }}"
-
-- name: Create openstack cephx key(s)
-  when:
-    - cephx | bool
-    - openstack_config | bool
-  block:
-    - name: Generate keys
-      ceph_key:
-        name: "{{ item.name }}"
-        caps: "{{ item.caps }}"
-        secret: "{{ item.key | default('') }}"
-        cluster: "{{ cluster }}"
-        mode: "{{ item.mode | default(ceph_keyring_permissions) }}"
-      environment:
-        CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}"
-        CEPH_CONTAINER_BINARY: "{{ container_binary }}"
-      with_items: "{{ openstack_keys }}"
-      delegate_to: "{{ groups[mon_group_name][0] }}"
-      no_log: "{{ no_log_on_ceph_key_tasks }}"
-
-    - name: Get keys from monitors
-      ceph_key:
-        name: "{{ item.name }}"
-        cluster: "{{ cluster }}"
-        output_format: plain
-        state: info
-      environment:
-        CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}"
-        CEPH_CONTAINER_BINARY: "{{ container_binary }}"
-      register: _osp_keys
-      with_items: "{{ openstack_keys }}"
-      delegate_to: "{{ groups.get(mon_group_name)[0] }}"
-      no_log: "{{ no_log_on_ceph_key_tasks }}"
-
-    - name: Copy ceph key(s) if needed
-      ansible.builtin.copy:
-        dest: "/etc/ceph/{{ cluster }}.{{ item.0.item.name }}.keyring"
-        content: "{{ item.0.stdout + '\n' }}"
-        owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
-        group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
-        mode: "{{ item.0.item.mode | default(ceph_keyring_permissions) }}"
-      with_nested:
-        - "{{ _osp_keys.results }}"
-        - "{{ groups[mon_group_name] }}"
-      delegate_to: "{{ item.1 }}"
-      no_log: "{{ no_log_on_ceph_key_tasks }}"

diff --git a/roles/ceph-validate/tasks/check_pools.yml b/roles/ceph-validate/tasks/check_pools.yml
index bca9d26ff484fa2f2e6b0fa11fdff520bfcf71a2..0acf7c9572420c7d1a891a92f0af4282ce3d3bec 100644 (file)
--- a/roles/ceph-validate/tasks/check_pools.yml
+++ b/roles/ceph-validate/tasks/check_pools.yml
@@ -3,7 +3,6 @@
   ansible.builtin.fail:
     msg: "You must set a target_size_ratio value on following pool: {{ item.name }}."
   with_items:
-    - "{{ openstack_pools | default([]) }}"
     - "{{ cephfs_pools | default([]) }}"
     - "{{ pools | default([]) }}"
   when:

diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all
index ce364b0fea6ca58c68c2daafe039d72719ac95c3..21e9bc5d50948c11b7fe7ce2dda63438713d0472 100644 (file)
--- a/tests/functional/all-in-one/container/group_vars/all
+++ b/tests/functional/all-in-one/container/group_vars/all
@@ -11,7 +11,6 @@ public_network: "192.168.19.0/24"
 cluster_network: "192.168.20.0/24"
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
-openstack_config: True
 dashboard_enabled: false
 ceph_conf_overrides:
   global:

diff --git a/tests/functional/all-in-one/group_vars/all b/tests/functional/all-in-one/group_vars/all
index 1b5ddd6348e8b13303656410acbbfaf3da4a0b55..e4967a8b147e34928d0f68873e3ec5d76dd4791d 100644 (file)
--- a/tests/functional/all-in-one/group_vars/all
+++ b/tests/functional/all-in-one/group_vars/all
@@ -4,7 +4,6 @@ ceph_origin: repository
 ceph_repository: community
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-openstack_config: True
 dashboard_enabled: False
 public_network: "192.168.17.0/24"
 cluster_network: "192.168.18.0/24"

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 4c45ec9c7d5d4bbc5c13d3297617796352fa8c55..7645c1ce8e6855d9040074768b9a9cbadbd6834a 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -17,18 +17,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 300
-openstack_config: True
-openstack_glance_pool:
-  name: "images"
-  size: 1
-  target_size_ratio: 0.2
-openstack_cinder_pool:
-  name: "volumes"
-  rule_name: "HDD"
-  size: 1
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
 docker_pull_timeout: 600s
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 63104689e766bff818d756bb8cb7a7faf2690199..f11618ce9a9e9257667f55a7e1c688332ed5af8a 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -11,20 +11,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 300
-openstack_config: True
-openstack_glance_pool:
-  name: "images"
-  size: 1
-  application: rbd
-  target_size_ratio: 0.2
-openstack_cinder_pool:
-  name: "volumes"
-  rule_name: "HDD"
-  size: 1
-  application: rbd
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 mds_max_mds: 2

diff --git a/tests/functional/all_daemons_ipv6/container/group_vars/all b/tests/functional/all_daemons_ipv6/container/group_vars/all
index 013fa975e2187e53134103e027c6787f6146b57e..f50a51cb2f256b2ed68b6181abb218cb6f5d88cc 100644 (file)
--- a/tests/functional/all_daemons_ipv6/container/group_vars/all
+++ b/tests/functional/all_daemons_ipv6/container/group_vars/all
@@ -18,18 +18,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 300
-openstack_config: True
-openstack_glance_pool:
-  name: "images"
-  size: 1
-  target_size_ratio: 0.2
-openstack_cinder_pool:
-  name: "volumes"
-  rule_name: "HDD"
-  size: 1
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
 docker_pull_timeout: 600s
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10

diff --git a/tests/functional/all_daemons_ipv6/group_vars/all b/tests/functional/all_daemons_ipv6/group_vars/all
index 204219f19ead689204b55638538470e23b018596..ab16bb789c87a77fe498b3fcbe57b9ac2bf589c4 100644 (file)
--- a/tests/functional/all_daemons_ipv6/group_vars/all
+++ b/tests/functional/all_daemons_ipv6/group_vars/all
@@ -12,20 +12,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 300
-openstack_config: True
-openstack_glance_pool:
-  name: "images"
-  size: 1
-  application: rbd
-  target_size_ratio: 0.2
-openstack_cinder_pool:
-  name: "volumes"
-  rule_name: "HDD"
-  size: 1
-  application: rbd
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 mds_max_mds: 2

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index 84d3dac2b373dca3d1456e1348cca44586d07823..b58d30a5d5e73c8bb5819691557f0ad295be5f1c 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -16,18 +16,6 @@ ceph_conf_overrides:
     mon_allow_pool_size_one: true
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: False
-openstack_glance_pool:
-  name: "images"
-  rule_name: "HDD"
-  size: 1
-openstack_cinder_pool:
-  name: "volumes"
-  rule_name: "HDD"
-  size: 1
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
@@ -38,4 +26,4 @@ ceph_docker_image_tag: latest-main
 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"
-grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
\ No newline at end of file
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"

diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all
index 0bf378374b39d2d9d6feb35b9af43671f8a0d27b..20cd47ae859ca980d9b1e5dd7704708179d5611b 100644 (file)
--- a/tests/functional/external_clients/container/inventory/group_vars/all
+++ b/tests/functional/external_clients/container/inventory/group_vars/all
@@ -11,7 +11,6 @@ public_network: "192.168.31.0/24"
 cluster_network: "192.168.32.0/24"
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
-openstack_config: True
 dashboard_enabled: false
 ceph_conf_overrides:
   global:

diff --git a/tests/functional/external_clients/inventory/group_vars/all b/tests/functional/external_clients/inventory/group_vars/all
index 1152b04cef4feeccd82b5954fe45207af4705f84..29c0ed43ba4a647a1d793234ab290747e1eb4c27 100644 (file)
--- a/tests/functional/external_clients/inventory/group_vars/all
+++ b/tests/functional/external_clients/inventory/group_vars/all
@@ -4,7 +4,6 @@ ceph_origin: repository
 ceph_repository: community
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-openstack_config: True
 dashboard_enabled: False
 public_network: "192.168.31.0/24"
 cluster_network: "192.168.32.0/24"

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index 225a5cffe0b04dd67b27772ba217330cb6e575e7..c9786a4dd8080f327d33e073827e1f059383588c 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -21,20 +21,6 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
-openstack_config: True
-openstack_glance_pool:
-  name: "images"
-  type: 3
-  size: 1
-  application: rbd
-  target_size_ratio: 0.2
-openstack_cinder_pool:
-  name: "volumes"
-  size: 1
-  application: rbd
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ 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-main

diff --git a/tests/functional/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all
index c8066f0132067243a46a44a2802e252d42e8bf84..c39cfd433d16c91f22bec70204be544803119e8c 100644 (file)
--- a/tests/functional/lvm-osds/group_vars/all
+++ b/tests/functional/lvm-osds/group_vars/all
@@ -16,17 +16,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
-openstack_config: True
-openstack_glance_pool:
-  name: "images"
-  type: 3
-  size: 1
-  application: rbd
-  target_size_ratio: 0.2
-openstack_cinder_pool:
-  name: "volumes"
-  size: 1
-  application: rbd
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
\ No newline at end of file
+

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 29709d562c4d044b7a246db8e6cd9bdac4620693..5ffd6f0f05c36e4473653db2b1b07f5406b92a82 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -15,18 +15,6 @@ ceph_conf_overrides:
     mon_allow_pool_size_one: true
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: True
-openstack_glance_pool:
-  name: "images"
-  rule_name: "HDD"
-  size: 1
-openstack_cinder_pool:
-  name: "volumes"
-  rule_name: "HDD"
-  size: 1
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
@@ -37,4 +25,4 @@ ceph_docker_image_tag: latest-main
 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"
-grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
\ No newline at end of file
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index e0cc1865e7de10a2acca66e6cbdc424e6a543037..4eb3151d082fcbf7de9fb09946a34e8e6cd0c34a 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -12,7 +12,6 @@ ceph_conf_overrides:
     mon_allow_pool_size_one: true
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index 671bc426b4992026102497c719c936a7001fda65..8ddb84b9a824caf223a9bbc5d9ac62ac54600139 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -12,7 +12,6 @@ ceph_conf_overrides:
     mon_allow_pool_size_one: true
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: False
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index 7415150db52d3b9e96477456ca5db5c6a77e40ff..d1e5d2182f40b40cdcd194af6749118fe5d74873 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -12,7 +12,6 @@ ceph_conf_overrides:
     mon_allow_pool_size_one: true
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: False
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index 1ae9358193eb2bcda907b22776e67e77b58dc136..5c56a1c18d54346e38c50ddab7e01a1cfcecb229 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -12,7 +12,6 @@ ceph_conf_overrides:
     mon_allow_pool_size_one: true
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io

diff --git a/tests/functional/shrink_osd/group_vars/all b/tests/functional/shrink_osd/group_vars/all
index d6999b17eea53f856b389eea108718dabae9f8f4..956f325f85a16992032a5820f5516a3271c4baba 100644 (file)
--- a/tests/functional/shrink_osd/group_vars/all
+++ b/tests/functional/shrink_osd/group_vars/all
@@ -6,6 +6,5 @@ cluster_network: "192.168.72.0/24"
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 3
-openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
\ 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 3fe10aa207c25f4a5810b787c02801ae7e9adff3..0ec43c75330e312915758c4d9a65a843c0cd681c 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -11,7 +11,6 @@ ceph_conf_overrides:
     mon_allow_pool_size_one: true
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io

diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all
index 9aafb5541bba4c52cc761b56cbfb44040a2f586d..8b918527f249f0ccb9ff12a9bb26837c0188af56 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -13,7 +13,6 @@ ceph_conf_overrides:
     mon_allow_pool_size_one: true
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io

diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all
index ad86c04010555ccc826900884b97a4d3794c9971..e0085ed78cd3e3f297b32a6f39c56b69f74f6e96 100644 (file)
--- a/tests/functional/subset_update/container/group_vars/all
+++ b/tests/functional/subset_update/container/group_vars/all
@@ -17,7 +17,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 300
-openstack_config: false
 docker_pull_timeout: 600s
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10

diff --git a/tests/functional/subset_update/group_vars/all b/tests/functional/subset_update/group_vars/all
index 03d44a831f20280b178449bf1c45ab20f9547ee0..e1bf727f322e79cb95881c61d94e4c1372251d65 100644 (file)
--- a/tests/functional/subset_update/group_vars/all
+++ b/tests/functional/subset_update/group_vars/all
@@ -11,7 +11,6 @@ ceph_conf_overrides:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 300
-openstack_config: false
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 mds_max_mds: 2