simplify monitor address setting

this drops the following parameters:

- monitor_address_block
- monitor_interface
- monitor_address

The monitor address will be automatically set from `public_network` parameter.

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

diff --git a/Vagrantfile b/Vagrantfile
index dde4b30893411fb265113d6553a286a600c6a3a8..85e9478ab29e5c62004f08fed9dbc1f0c7d5e9fc 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -88,7 +88,6 @@ ansible_provision = proc do |ansible|
   if DOCKER then
     ansible.extra_vars = ansible.extra_vars.merge({
       containerized_deployment: 'true',
-      monitor_interface: ETH,
       ceph_mon_docker_subnet: ansible.extra_vars[:public_network],
       devices: settings['disks'],
       radosgw_interface: ETH,
@@ -97,7 +96,6 @@ ansible_provision = proc do |ansible|
   else
     ansible.extra_vars = ansible.extra_vars.merge({
       devices: settings['disks'],
-      monitor_interface: ETH,
       radosgw_interface: ETH,
       os_tuning_params: settings['os_tuning_params'],
     })
@@ -105,8 +103,6 @@ ansible_provision = proc do |ansible|
 
   if BOX == 'linode' then
     ansible.sudo = true
-    # Use monitor_address_block instead of monitor_interface:
-    ansible.extra_vars.delete(:monitor_interface)
     # Use radosgw_address_block instead of radosgw_interface:
     ansible.extra_vars.delete(:radosgw_interface)
     ansible.extra_vars = ansible.extra_vars.merge({

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 1d20060d6dc7cca24e3cfc1708cb1082a370ced9..71b2ce860305804b488b4502d18510f4845eecc7 100644 (file)
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -228,7 +228,6 @@ An example configuration that deploys the upstream ``octopus`` version of Ceph w
    ceph_repository: community
    public_network: "192.168.3.0/24"
    cluster_network: "192.168.4.0/24"
-   monitor_interface: eth1
    devices:
      - '/dev/sda'
      - '/dev/sdb'
@@ -238,7 +237,6 @@ selection or other aspects of your cluster.
 
 - ``ceph_origin``
 - ``public_network``
-- ``monitor_interface`` or ``monitor_address``
 
 
 When deploying RGW instance(s) you are required to set the ``radosgw_interface`` or ``radosgw_address`` config option.

diff --git a/docs/source/testing/scenarios.rst b/docs/source/testing/scenarios.rst
index 185f994633df3f772f9247565f2d1348a6d111d2..c05d91899a2f6c0cb80890f6f5db97b3e4f4763c 100644 (file)
--- a/docs/source/testing/scenarios.rst
+++ b/docs/source/testing/scenarios.rst
@@ -130,15 +130,15 @@ way so that a vagrant environment can be isolated to the given scenario.
 The ``hosts`` file should contain the hosts needed for the scenario. This might
 seem a bit repetitive since machines are already defined in
 :ref:`vagrant_variables` but it allows granular changes to hosts (for example
-defining an interface vs. an IP on a monitor) which can help catch issues in
+defining different public_network values between monitors) which can help catch issues in
 ``ceph-ansible`` configuration. For example:
 
 .. code-block:: ini
 
    [mons]
-   mon0 monitor_address=192.168.5.10
-   mon1 monitor_address=192.168.5.11
-   mon2 monitor_interface=eth1
+   mon0 public_network=192.168.1.0/24
+   mon1 public_network=192.168.2.0/24
+   mon2 public_network=192.168.3.0/24
 
 .. _group_vars:
 

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index d596d53a727aba18b6cd64bc74baa005dbe07dcd..77d3536d1d2d46a8d05f0023809fe51e87d77484 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -311,14 +311,6 @@ dummy:
 #rbd_client_admin_socket_path: /var/run/ceph # must be writable by QEMU and allowed by SELinux or AppArmor
 
 ## Monitor options
-#
-# You must define either monitor_interface, monitor_address or monitor_address_block.
-# These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml).
-# Eg. If you want to specify for each monitor which address the monitor will bind to you can set it in your **inventory host file** by using 'monitor_address' variable.
-# Preference will go to monitor_address if both monitor_address and monitor_interface are defined.
-#monitor_interface: interface
-#monitor_address: x.x.x.x
-#monitor_address_block: subnet
 # set to either ipv4 or ipv6, whichever your network is using
 #ip_version: ipv4
 

diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
index c6892208b7e51b820b07649d64ced512cf2ee349..5aaade4667546bf8684825d71118e9c38fa9ce04 100644 (file)
--- a/group_vars/mons.yml.sample
+++ b/group_vars/mons.yml.sample
@@ -62,7 +62,7 @@ dummy:
 #    - --default-mon-cluster-log-to-stderr=true
 #    - -i={{ monitor_name }}
 #    - --mon-data=/var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}
-#    - --public-addr={{ _current_monitor_address }}
+#    - --public-addr={{ _monitor_addresses[inventory_hostname] }}
 #    - --mon-initial-members={{ groups[mon_group_name] | join(',') }}
 
 

diff --git a/infrastructure-playbooks/cephadm.yml b/infrastructure-playbooks/cephadm.yml
index 95c3896da99aa8dbee0f17c2603dbbaa9f1a6abb..b08e7f21d8fabfedc105608f1591eeb8ea29df4e 100644 (file)
--- a/infrastructure-playbooks/cephadm.yml
+++ b/infrastructure-playbooks/cephadm.yml
@@ -30,15 +30,6 @@
       run_once: true
       when: groups[mgr_group_name] is undefined or groups[mgr_group_name] | length == 0
 
-    - name: Validate monitor network configuration
-      ansible.builtin.fail:
-        msg: "Either monitor_address, monitor_address_block or monitor_interface must be provided"
-      when:
-        - mon_group_name in group_names
-        - monitor_address == 'x.x.x.x'
-        - monitor_address_block == 'subnet'
-        - monitor_interface == 'interface'
-
     - name: Validate dashboard configuration
       when: dashboard_enabled | bool
       run_once: true
@@ -158,7 +149,7 @@
 
     - name: Bootstrap the new cluster
       cephadm_bootstrap:
-        mon_ip: "{{ _current_monitor_address }}"
+        mon_ip: "{{ _monitor_addresses[inventory_hostname] }}"
         image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
         docker: "{{ true if container_binary == 'docker' else false }}"
         pull: false

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index de0a08cf38d07c43dabf415ba50bda98961de320..a403c4eeb66421f3ffbe12b4c42b25e08e5bb3b0 100644 (file)
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -304,7 +304,7 @@
           delegate_facts: true
 
         - name: Non container | waiting for the monitor to join the quorum...
-          ansible.builtin.command: ceph --cluster "{{ cluster }}" -m "{{ hostvars[groups[mon_group_name][0]]['_current_monitor_address'] }}" quorum_status --format json
+          ansible.builtin.command: ceph --cluster "{{ cluster }}" -m "{{ _monitor_addresses[groups['mons'][0]] }}" quorum_status --format json
           register: ceph_health_raw
           until:
             - ceph_health_raw.rc == 0
@@ -317,7 +317,7 @@
 
         - name: Container | waiting for the containerized monitor to join the quorum...
           ansible.builtin.command: >
-            {{ container_binary }} exec ceph-mon-{{ ansible_facts['hostname'] }} ceph --cluster "{{ cluster }}" -m "{{ hostvars[groups[mon_group_name][0]]['_current_monitor_address'] }}" quorum_status --format json
+            {{ container_binary }} exec ceph-mon-{{ ansible_facts['hostname'] }} ceph --cluster "{{ cluster }}" -m "{{ _monitor_addresses[groups['mons'][0]] }}" quorum_status --format json
           register: ceph_health_raw
           until:
             - ceph_health_raw.rc == 0

diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2
index af5d1cb5dea7e54d05b22186bb81a9a52955c22d..c68908b4157754bdd49da1a91db61d5876e4536d 100644 (file)
--- a/roles/ceph-config/templates/ceph.conf.j2
+++ b/roles/ceph-config/templates/ceph.conf.j2
@@ -13,11 +13,11 @@ auth client required = none
 
 fsid = {{ fsid }}
 mon host = {% if nb_mon > 0 %}
-{% for host in _monitor_addresses -%}
+{% for name, addr in _monitor_addresses.items() -%}
 {% if mon_host_v1.enabled | bool %}
-{% set _v1 = ',v1:' + host.addr + mon_host_v1.suffix %}
+{% set _v1 = ',v1:' + addr + mon_host_v1.suffix %}
 {% endif %}
-[{{ "v2:" + host.addr + mon_host_v2.suffix }}{{ _v1 | default('') }}]
+[{{ "v2:" + addr + mon_host_v2.suffix }}{{ _v1 | default('') }}]
 {%- if not loop.last -%},{%- endif %}
 {%- endfor %}
 {% elif nb_mon == 0 %}

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 0b8e339a6a3ca825b932c7e697cbad399dc1701d..79ef487dee70d446c879b7d72b0e67b9f1ef10d3 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -303,14 +303,6 @@ rbd_client_log_file: "{{ rbd_client_log_path }}/qemu-guest-$pid.log" # must be w
 rbd_client_admin_socket_path: /var/run/ceph # must be writable by QEMU and allowed by SELinux or AppArmor
 
 ## Monitor options
-#
-# You must define either monitor_interface, monitor_address or monitor_address_block.
-# These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml).
-# Eg. If you want to specify for each monitor which address the monitor will bind to you can set it in your **inventory host file** by using 'monitor_address' variable.
-# Preference will go to monitor_address if both monitor_address and monitor_interface are defined.
-monitor_interface: interface
-monitor_address: x.x.x.x
-monitor_address_block: subnet
 # set to either ipv4 or ipv6, whichever your network is using
 ip_version: ipv4
 

diff --git a/roles/ceph-facts/tasks/set_monitor_address.yml b/roles/ceph-facts/tasks/set_monitor_address.yml
index 8f3aa57b5f85fd97abd1552bd2693966f726d9e8..142b56a2a1ed057c99b6a43d9f607b4c73fd736c 100644 (file)
--- a/roles/ceph-facts/tasks/set_monitor_address.yml
+++ b/roles/ceph-facts/tasks/set_monitor_address.yml
@@ -1,59 +1,14 @@
 ---
-- name: Set_fact _monitor_addresses to monitor_address_block ipv4
+- name: Set_fact _monitor_addresses - ipv4
   ansible.builtin.set_fact:
-    _monitor_addresses: "{{ _monitor_addresses | default([]) + [{'name': item, 'addr': hostvars[item]['ansible_facts']['all_ipv4_addresses'] | ips_in_ranges(hostvars[item]['monitor_address_block'].split(',')) | first}] }}"
+    _monitor_addresses: "{{ _monitor_addresses | default({}) | combine({item: hostvars[item]['ansible_facts']['all_ipv4_addresses'] | ips_in_ranges(hostvars[item]['public_network'].split(',')) | first}) }}"
   with_items: "{{ groups.get(mon_group_name, []) }}"
   when:
-    - "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') |  map(attribute='name') | list"
-    - hostvars[item]['monitor_address_block'] is defined
-    - hostvars[item]['monitor_address_block'] != 'subnet'
     - ip_version == 'ipv4'
 
-- name: Set_fact _monitor_addresses to monitor_address_block ipv6
+- name: Set_fact _monitor_addresses - ipv6
   ansible.builtin.set_fact:
-    _monitor_addresses: "{{ _monitor_addresses | default([]) + [{'name': item, 'addr': hostvars[item]['ansible_facts']['all_ipv6_addresses'] | ips_in_ranges(hostvars[item]['monitor_address_block'].split(',')) | last | ansible.utils.ipwrap}] }}"
+    _monitor_addresses: "{{ _monitor_addresses | default({}) | combine({item: hostvars[item]['ansible_facts']['all_ipv6_addresses'] | ips_in_ranges(hostvars[item]['public_network'].split(',')) | last | ansible.utils.ipwrap}) }}"
   with_items: "{{ groups.get(mon_group_name, []) }}"
   when:
-    - "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') |  map(attribute='name') | list"
-    - hostvars[item]['monitor_address_block'] is defined
-    - hostvars[item]['monitor_address_block'] != 'subnet'
     - ip_version == 'ipv6'
-
-- name: Set_fact _monitor_addresses to monitor_address
-  ansible.builtin.set_fact:
-    _monitor_addresses: "{{ _monitor_addresses | default([]) + [{'name': item, 'addr': hostvars[item]['monitor_address'] | ansible.utils.ipwrap}] }}"
-  with_items: "{{ groups.get(mon_group_name, []) }}"
-  when:
-    - "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
-    - hostvars[item]['monitor_address'] is defined
-    - hostvars[item]['monitor_address'] != 'x.x.x.x'
-
-- name: Set_fact _monitor_addresses to monitor_interface - ipv4
-  ansible.builtin.set_fact:
-    _monitor_addresses: "{{ _monitor_addresses | default([]) + [{'name': item, 'addr': hostvars[item]['ansible_facts'][(hostvars[item]['monitor_interface'] | replace('-', '_'))][ip_version]['address'] | ansible.utils.ipwrap}] }}"
-  with_items: "{{ groups.get(mon_group_name, []) }}"
-  when:
-    - "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
-    - ip_version == 'ipv4'
-    - hostvars[item]['monitor_address_block'] | default('subnet')  == 'subnet'
-    - hostvars[item]['monitor_address'] | default('x.x.x.x') == 'x.x.x.x'
-    - hostvars[item]['monitor_interface'] | default('interface') != 'interface'
-
-- name: Set_fact _monitor_addresses to monitor_interface - ipv6
-  ansible.builtin.set_fact:
-    _monitor_addresses: "{{ _monitor_addresses | default([]) + [{'name': item, 'addr': hostvars[item]['ansible_facts'][(hostvars[item]['monitor_interface'] | replace('-', '_'))][ip_version][0]['address'] | ansible.utils.ipwrap}] }}"
-  with_items: "{{ groups.get(mon_group_name, []) }}"
-  when:
-    - "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
-    - ip_version == 'ipv6'
-    - hostvars[item]['monitor_address_block'] | default('subnet')  == 'subnet'
-    - hostvars[item]['monitor_address'] | default('x.x.x.x') == 'x.x.x.x'
-    - hostvars[item]['monitor_interface'] | default('interface') != 'interface'
-
-- name: Set_fact _current_monitor_address
-  ansible.builtin.set_fact:
-    _current_monitor_address: "{{ item.addr }}"
-  with_items: "{{ _monitor_addresses }}"
-  when:
-    - (inventory_hostname == item.name and not rolling_update | default(False) | bool)
-      or (rolling_update | default(False) | bool and item.name == groups.get(mon_group_name, [])[0])

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 1e470036b2a3eb42ec916e6ec2440d8f69e94ae1..ec3364529a959de1c53c09f1c1155762f6d83188 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -54,7 +54,7 @@ ceph_mon_container_params:
     - --default-mon-cluster-log-to-stderr=true
     - -i={{ monitor_name }}
     - --mon-data=/var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}
-    - --public-addr={{ _current_monitor_address }}
+    - --public-addr={{ _monitor_addresses[inventory_hostname] }}
     - --mon-initial-members={{ groups[mon_group_name] | map('extract', hostvars, 'ansible_facts') | map(attribute='hostname') | join(',') }}
 
 

diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml
index 153541807081e56df7dbf8e8e29ec2938bd50003..9f89de97ad2fb128b9682c6da6e994c0cdbe6284 100644 (file)
--- a/roles/ceph-mon/tasks/deploy_monitors.yml
+++ b/roles/ceph-mon/tasks/deploy_monitors.yml
@@ -158,13 +158,13 @@
   ansible.builtin.command: >
     {{ ceph_monmaptool_cmd }}
     --create
-    {% for host in _monitor_addresses -%}
+    {% for name, addr in _monitor_addresses.items() -%}
     --addv
-    {{ host.name }}
+    {{ hostvars[name]['ansible_facts']['hostname'] }}
     {% if mon_host_v1.enabled | bool %}
-    {% set _v1 = ',v1:' + host.addr + mon_host_v1.suffix %}
+    {% set _v1 = ',v1:' + addr + mon_host_v1.suffix %}
     {% endif %}
-    [{{ "v2:" + host.addr + mon_host_v2.suffix }}{{ _v1 | default('') }}]
+    [{{ "v2:" + addr + mon_host_v2.suffix }}{{ _v1 | default('') }}]
     {# {%- if not loop.last -%},{%- endif %} #}
     {%- endfor %}
     --enable-all-features

diff --git a/roles/ceph-validate/tasks/check_eth_mon.yml b/roles/ceph-validate/tasks/check_eth_mon.yml
deleted file mode 100644 (file)
index 21a58f3..0000000
--- a/roles/ceph-validate/tasks/check_eth_mon.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- name: Check if network interface exists
-  ansible.builtin.fail:
-    msg: "{{ monitor_interface }} does not exist on {{ inventory_hostname }}"
-  when: monitor_interface not in ansible_facts['interfaces']
-
-- name: Check if network interface is active
-  ansible.builtin.fail:
-    msg: "{{ monitor_interface }} is not active on {{ inventory_hostname }}"
-  when: not hostvars[inventory_hostname]['ansible_facts'][(monitor_interface | replace('-', '_'))]['active']
-
-- name: Check if network interface has an IPv4 address
-  ansible.builtin.fail:
-    msg: "{{ monitor_interface }} does not have any IPv4 address on {{ inventory_hostname }}"
-  when:
-    - ip_version == "ipv4"
-    - hostvars[inventory_hostname]['ansible_facts'][(monitor_interface | replace('-', '_'))]['ipv4'] is not defined
-
-- name: Check if network interface has an IPv6 address
-  ansible.builtin.fail:
-    msg: "{{ monitor_interface }} does not have any IPv6 address on {{ inventory_hostname }}"
-  when:
-    - ip_version == "ipv6"
-    - hostvars[inventory_hostname]['ansible_facts'][(monitor_interface | replace('-', '_'))]['ipv6'] is not defined

diff --git a/roles/ceph-validate/tasks/check_ipaddr_mon.yml b/roles/ceph-validate/tasks/check_ipaddr_mon.yml
index 9183b385bfd6ecd1ad4579b2e62ef68dd5ed12eb..cf4cc71dbd0fe4a46029548bda73fbecb52cb0fe 100644 (file)
--- a/roles/ceph-validate/tasks/check_ipaddr_mon.yml
+++ b/roles/ceph-validate/tasks/check_ipaddr_mon.yml
@@ -1,5 +1,5 @@
 ---
-- name: Check if network interface has an IP address in `monitor_address_block`
+- name: Check if network interface has an IP address in public_network
   ansible.builtin.fail:
-    msg: "{{ inventory_hostname }} does not have any {{ ip_version }} address on {{ monitor_address_block }}"
-  when: hostvars[inventory_hostname]['ansible_facts']['all_' + ip_version + '_addresses'] | ips_in_ranges(hostvars[inventory_hostname]['monitor_address_block'].split(',')) | length == 0
+    msg: "{{ inventory_hostname }} does not have any {{ ip_version }} address on {{ public_network }}"
+  when: hostvars[inventory_hostname]['ansible_facts']['all_' + ip_version + '_addresses'] | ips_in_ranges(hostvars[inventory_hostname]['public_network'].split(',')) | length == 0

diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml
index f0caab90f20db9c332417591eaa3faff793b7d4a..885ffb36ae2e182af568f57e1f5400cebe7c9155 100644 (file)
--- a/roles/ceph-validate/tasks/main.yml
+++ b/roles/ceph-validate/tasks/main.yml
@@ -11,15 +11,6 @@
     msg: "osd_objectstore must be 'bluestore''"
   when: osd_objectstore not in ['bluestore']
 
-- name: Validate monitor network configuration
-  ansible.builtin.fail:
-    msg: "Either monitor_address, monitor_address_block or monitor_interface must be provided"
-  when:
-    - mon_group_name in group_names
-    - monitor_address == 'x.x.x.x'
-    - monitor_address_block == 'subnet'
-    - monitor_interface == 'interface'
-
 - name: Validate radosgw network configuration
   ansible.builtin.fail:
     msg: "Either radosgw_address, radosgw_address_block or radosgw_interface must be provided"
@@ -107,22 +98,6 @@
     - osd_group_name in group_names
     - not osd_auto_discovery | default(False) | bool
 
-- name: Include check_eth_mon.yml
-  ansible.builtin.include_tasks: check_eth_mon.yml
-  when:
-    - mon_group_name in group_names
-    - monitor_interface != "dummy"
-    - monitor_address == "x.x.x.x"
-    - monitor_address_block == "subnet"
-
-- name: Include check_ipaddr_mon.yml
-  ansible.builtin.include_tasks: check_ipaddr_mon.yml
-  when:
-    - mon_group_name in group_names
-    - monitor_interface == "interface"
-    - monitor_address == "x.x.x.x"
-    - monitor_address_block != "subnet"
-
 - name: Include check_eth_rgw.yml
   ansible.builtin.include_tasks: check_eth_rgw.yml
   when:

diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all
index abacaac81de740b1784624feb84029f901ce64a5..5816822db78fd6abffbcfb51d642cc0b0eef2ba6 100644 (file)
--- a/tests/functional/add-mdss/container/group_vars/all
+++ b/tests/functional/add-mdss/container/group_vars/all
@@ -6,7 +6,6 @@ containerized_deployment: true
 cluster: ceph
 public_network: "192.168.63.0/24"
 cluster_network: "192.168.64.0/24"
-monitor_interface: eth1
 radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-mdss/group_vars/all b/tests/functional/add-mdss/group_vars/all
index 650540b496657277a0cf12d67c4a711f25ab69e5..5bc3323899405d613da508125cffd8130333bf24 100644 (file)
--- a/tests/functional/add-mdss/group_vars/all
+++ b/tests/functional/add-mdss/group_vars/all
@@ -4,7 +4,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.61.0/24"
 cluster_network: "192.168.62.0/24"
-monitor_interface: eth1
 radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all
index 34065af173d5e38ebe428d8432566df552153362..7c57901d2062c71b3e8b103155e370f8533c490b 100644 (file)
--- a/tests/functional/add-mgrs/container/group_vars/all
+++ b/tests/functional/add-mgrs/container/group_vars/all
@@ -6,7 +6,6 @@ containerized_deployment: true
 cluster: ceph
 public_network: "192.168.75.0/24"
 cluster_network: "192.168.76.0/24"
-monitor_interface: eth1
 radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-mgrs/group_vars/all b/tests/functional/add-mgrs/group_vars/all
index fb9bde0f09e17f9a557152fe547baaaceb0efd8a..b83a59ac13ccdbb0b5dc085a75bd26e41d4288ee 100644 (file)
--- a/tests/functional/add-mgrs/group_vars/all
+++ b/tests/functional/add-mgrs/group_vars/all
@@ -4,7 +4,6 @@ ceph_repository: dev
 cluster: ceph
 public_network: "192.168.73.0/24"
 cluster_network: "192.168.74.0/24"
-monitor_interface: eth1
 radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all
index 1fff68805fb0aa9ce8f00fbbcf5813e5893be652..9846e09db0733872f4b51ec65ddf358cd0bb93fb 100644 (file)
--- a/tests/functional/add-mons/container/group_vars/all
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -6,7 +6,6 @@ containerized_deployment: true
 cluster: ceph
 public_network: "192.168.55.0/24"
 cluster_network: "192.168.56.0/24"
-monitor_interface: eth1
 radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-mons/group_vars/all b/tests/functional/add-mons/group_vars/all
index 7988877c047c719588771d4bb8d91c3a38db67af..ca9925379b00aa23ced8c97fb9a3ccd3258dc137 100644 (file)
--- a/tests/functional/add-mons/group_vars/all
+++ b/tests/functional/add-mons/group_vars/all
@@ -4,7 +4,6 @@ ceph_repository: dev
 cluster: ceph
 public_network: "192.168.53.0/24"
 cluster_network: "192.168.54.0/24"
-monitor_interface: eth1
 radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 39022d7a608003861b50b179e699ca784a2feb71..e6711bff6483754e94a04289967cdd82c023abf1 100644 (file)
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -6,7 +6,6 @@ containerized_deployment: true
 cluster: ceph
 public_network: "192.168.55.0/24"
 cluster_network: "192.168.56.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-osds/group_vars/all b/tests/functional/add-osds/group_vars/all
index ef109c9b8b6b20c1fcf9a5b72dd89fbf30191de7..2b6e2b8b742ab87011be7cfb9dd71cb334392eaf 100644 (file)
--- a/tests/functional/add-osds/group_vars/all
+++ b/tests/functional/add-osds/group_vars/all
@@ -4,7 +4,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.53.0/24"
 cluster_network: "192.168.54.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all
index c275d4f084bd166d458cfa6f068af514f7a77f59..9ad653c92f090c5eb160ab8d9cfeffedff9815c8 100644 (file)
--- a/tests/functional/add-rbdmirrors/container/group_vars/all
+++ b/tests/functional/add-rbdmirrors/container/group_vars/all
@@ -6,7 +6,6 @@ containerized_deployment: true
 cluster: ceph
 public_network: "192.168.67.0/24"
 cluster_network: "192.168.68.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-rbdmirrors/group_vars/all b/tests/functional/add-rbdmirrors/group_vars/all
index 119d13167eb3a37c5137a072ed5f99346e779f0f..6b6d1dc9b52f7669432b470d70ff96f3955f8cbe 100644 (file)
--- a/tests/functional/add-rbdmirrors/group_vars/all
+++ b/tests/functional/add-rbdmirrors/group_vars/all
@@ -4,7 +4,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.65.0/24"
 cluster_network: "192.168.66.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all
index 1de1eea6f8933cfb213695c2cae95050efca9c01..cc232ecb189301b5d460017f789bc041c33c3c95 100644 (file)
--- a/tests/functional/add-rgws/container/group_vars/all
+++ b/tests/functional/add-rgws/container/group_vars/all
@@ -6,7 +6,6 @@ containerized_deployment: true
 cluster: ceph
 public_network: "192.168.71.0/24"
 cluster_network: "192.168.72.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/add-rgws/group_vars/all b/tests/functional/add-rgws/group_vars/all
index e7326ec8ec0077bfcf826198237adc6aad509423..2aae8605932e20ca0cccada7e501c1f07892c101 100644 (file)
--- a/tests/functional/add-rgws/group_vars/all
+++ b/tests/functional/add-rgws/group_vars/all
@@ -4,7 +4,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.69.0/24"
 cluster_network: "192.168.70.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all
index daa915a6568740954808e186a36d93cf049b7070..ce364b0fea6ca58c68c2daafe039d72719ac95c3 100644 (file)
--- a/tests/functional/all-in-one/container/group_vars/all
+++ b/tests/functional/all-in-one/container/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_num_instances: 2
 ceph_mon_docker_subnet: "{{ public_network }}"

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

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 6dfcb137c949f8d183ad27c6ad26f24780437362..4c45ec9c7d5d4bbc5c13d3297617796352fa8c55 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 public_network: "192.168.17.0/24"

diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts
index fa75c7d795053fe09402beebb7f7cc83e3a8e103..51d488ccbd560acf69e2075076a1bb8428f61656 100644 (file)
--- a/tests/functional/all_daemons/container/hosts
+++ b/tests/functional/all_daemons/container/hosts
@@ -1,7 +1,7 @@
 [mons]
-mon0 monitor_address=192.168.17.10
-mon1 monitor_interface="{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
-mon2 monitor_address=192.168.17.12
+mon0
+mon1
+mon2
 
 [mgrs]
 mgr0

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index efd2430cf7e06ab71e4d578afb639aabca41c904..63104689e766bff818d756bb8cb7a7faf2690199 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -1,8 +1,8 @@
 ---
 ceph_origin: repository
-ceph_repository: community
-public_network: "192.168.1.0/24"
-cluster_network: "192.168.2.0/24"
+ceph_repository: dev
+public_network: "192.168.110.0/24"
+cluster_network: "192.168.220.0/24"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_conf_overrides:
   global:
@@ -36,3 +36,4 @@ 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"
 grafana_server_group_name: ceph_monitoring
+dashboard_enabled: false

diff --git a/tests/functional/all_daemons/group_vars/mons b/tests/functional/all_daemons/group_vars/mons
index f6ab9a5415ec4a83aff670e1fcbd94d55ca1cbec..bc6941bd2a77701c06eab2449b95940dcb6b417c 100644 (file)
--- a/tests/functional/all_daemons/group_vars/mons
+++ b/tests/functional/all_daemons/group_vars/mons
@@ -1,6 +1,6 @@
 ---
-create_crush_tree: True
-crush_rule_config: True
+create_crush_tree: true
+crush_rule_config: true
 crush_rule_hdd:
   name: HDD
   root: default
@@ -8,4 +8,4 @@ crush_rule_hdd:
   class: hdd
   default: true
 crush_rules:
-  - "{{ crush_rule_hdd }}"
\ No newline at end of file
+  - "{{ crush_rule_hdd }}"

diff --git a/tests/functional/all_daemons/group_vars/nfss b/tests/functional/all_daemons/group_vars/nfss
index fc280e25136655e1b5203ebbc8d1190dc4703ab4..826bdfecd6fc5f6b49b19c1b689583b995d40ad3 100644 (file)
--- a/tests/functional/all_daemons/group_vars/nfss
+++ b/tests/functional/all_daemons/group_vars/nfss
@@ -5,6 +5,6 @@ ganesha_conf_overrides: |
     CACHEINODE {
             Entries_HWMark = 100000;
     }
-nfs_ganesha_stable: true
-nfs_ganesha_dev: false
+nfs_ganesha_stable: false
+nfs_ganesha_dev: true
 nfs_ganesha_flavor: "ceph_main"

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index aeb10eed6f485bd3a78b90f30e931a0980c5bc53..8e2019776a5f66c360e321a336be8da695c9415e 100644 (file)
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -1,7 +1,7 @@
 [mons]
-mon0 monitor_address=192.168.1.10
-mon1 monitor_interface="{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
-mon2 monitor_address=192.168.1.12
+mon0
+mon1
+mon2
 
 [mgrs]
 mgr0

diff --git a/tests/functional/all_daemons/hosts-switch-to-containers b/tests/functional/all_daemons/hosts-switch-to-containers
index fabb659f0bc76283b6507fbbfa46ca280a2f2436..ceae369ebca63a49014b2149ea889138da92177f 100644 (file)
--- a/tests/functional/all_daemons/hosts-switch-to-containers
+++ b/tests/functional/all_daemons/hosts-switch-to-containers
@@ -2,9 +2,9 @@
 docker=True
 
 [mons]
-mon0 monitor_address=192.168.1.10
-mon1 monitor_interface="{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
-mon2 monitor_address=192.168.1.12
+mon0
+mon1
+mon2
 
 [mgrs]
 mgr0

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index 48653bbbb94c85c4cae4d5c7a9eabce093148ca3..5a58fc8b0ef700205d467de476394e6bbf51c778 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -19,8 +19,8 @@ mgr_vms: 1
 ceph_install_source: stable
 
 # SUBNETS TO USE FOR THE VMS
-public_subnet: 192.168.1
-cluster_subnet: 192.168.2
+public_subnet: 192.168.110
+cluster_subnet: 192.168.220
 
 # MEMORY
 # set 1024 for CentOS

diff --git a/tests/functional/all_daemons_ipv6/container/group_vars/all b/tests/functional/all_daemons_ipv6/container/group_vars/all
index d0c9ee6bcf18e95aa7a00fd824f9aad6f1338b8a..013fa975e2187e53134103e027c6787f6146b57e 100644 (file)
--- a/tests/functional/all_daemons_ipv6/container/group_vars/all
+++ b/tests/functional/all_daemons_ipv6/container/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ip_version: ipv6

diff --git a/tests/functional/all_daemons_ipv6/container/hosts b/tests/functional/all_daemons_ipv6/container/hosts
index 81cf5c2dc0f198c2a53161c78cb2daf7faf386e4..51d488ccbd560acf69e2075076a1bb8428f61656 100644 (file)
--- a/tests/functional/all_daemons_ipv6/container/hosts
+++ b/tests/functional/all_daemons_ipv6/container/hosts
@@ -1,7 +1,7 @@
 [mons]
-mon0 monitor_address="fdec:f1fb:29cd:6940::10"
-mon1 monitor_interface="{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
-mon2 monitor_address="fdec:f1fb:29cd:6940::12"
+mon0
+mon1
+mon2
 
 [mgrs]
 mgr0

diff --git a/tests/functional/all_daemons_ipv6/hosts b/tests/functional/all_daemons_ipv6/hosts
index 78b212478e00e46a8862f9377ba28fe52f4f26c0..8e2019776a5f66c360e321a336be8da695c9415e 100644 (file)
--- a/tests/functional/all_daemons_ipv6/hosts
+++ b/tests/functional/all_daemons_ipv6/hosts
@@ -1,7 +1,7 @@
 [mons]
-mon0 monitor_address="fdec:f1fb:29cd:6940::10"
-mon1 monitor_interface="{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
-mon2 monitor_address="fdec:f1fb:29cd:6940::12"
+mon0
+mon1
+mon2
 
 [mgrs]
 mgr0

diff --git a/tests/functional/cephadm/group_vars/all b/tests/functional/cephadm/group_vars/all
index 2e074a2716975c7fa3ffaa5367ec65ddc86b5ba4..0acf604ad78e1d9b75b6b0ce4421ac26ff8fe584 100644 (file)
--- a/tests/functional/cephadm/group_vars/all
+++ b/tests/functional/cephadm/group_vars/all
@@ -1,5 +1,4 @@
 ---
-monitor_interface: eth1
 public_network: "192.168.30.0/24"
 cluster_network: "192.168.31.0/24"
 dashboard_admin_password: $sX!cD$rYU6qR^B!

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index e6f0fab1edf259edb474d570f101a6a4ad1f148b..b60168ab731dacac2fd7d5c8aed016da5c16e4e8 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_num_instances: 2
 ceph_mon_docker_subnet: "{{ public_network }}"

diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all
index 423ffbac7c40001613fa5d3e6314d9c22cdb83d1..8e4061e4d18b9f29f5daff65b38d3130b264f500 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -2,7 +2,6 @@
 containerized_deployment: False
 ceph_origin: repository
 ceph_repository: community
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 public_network: "192.168.15.0/24"

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index 42e97ffd8e5146d2b3af00ae569d341b67c47720..84d3dac2b373dca3d1456e1348cca44586d07823 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -5,7 +5,6 @@ docker: True
 container_binary: docker
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 public_network: "192.168.58.0/24"

diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all
index 940a55ff861d809f49ec9eac45bc88211373b5da..0bf378374b39d2d9d6feb35b9af43671f8a0d27b 100644 (file)
--- a/tests/functional/external_clients/container/inventory/group_vars/all
+++ b/tests/functional/external_clients/container/inventory/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_num_instances: 2
 ceph_mon_docker_subnet: "{{ public_network }}"

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

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index dab885f7a8d18402b9447cffb9b44d415b3722e0..b352cab0e86d203af6d6dae980efb1f34d6f706c 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -10,7 +10,6 @@ ceph_repository: dev
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/lvm-auto-discovery/group_vars/all b/tests/functional/lvm-auto-discovery/group_vars/all
index 149cd228fd864ca95df6a589f7dc0d72fa60db27..157cb79c74ddd9ddff702038d55fcc29e33a840e 100644 (file)
--- a/tests/functional/lvm-auto-discovery/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/group_vars/all
@@ -5,7 +5,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 crush_device_class: test

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index a3e868dd31305c5396d50607d970bb1a78e42b29..3e5f217767e12d26ee2c0ccebca3902a77db219d 100644 (file)
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -10,7 +10,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 crush_device_class: test
 copy_admin_key: true

diff --git a/tests/functional/lvm-batch/group_vars/all b/tests/functional/lvm-batch/group_vars/all
index 0c432635caebd4dbc1a43279517c9a51ad7c7d4a..22c46d1aa61bfe1a7d2a962ad1b648a0cf3bdb31 100644 (file)
--- a/tests/functional/lvm-batch/group_vars/all
+++ b/tests/functional/lvm-batch/group_vars/all
@@ -5,7 +5,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 crush_device_class: test
 copy_admin_key: true

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index 5e812e3556270865af8ebe7a90081ef72aed4fc0..225a5cffe0b04dd67b27772ba217330cb6e575e7 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -8,7 +8,6 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.33.0/24"
 cluster_network: "192.168.34.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 copy_admin_key: true
 containerized_deployment: true
 # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb

diff --git a/tests/functional/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all
index 3ee80cc074208c5c076f9bccf5e586eebda7b4d8..c8066f0132067243a46a44a2802e252d42e8bf84 100644 (file)
--- a/tests/functional/lvm-osds/group_vars/all
+++ b/tests/functional/lvm-osds/group_vars/all
@@ -4,7 +4,6 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 copy_admin_key: true
 # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
 os_tuning_params:

diff --git a/tests/functional/migrate_ceph_disk_to_ceph_volume/group_vars/all b/tests/functional/migrate_ceph_disk_to_ceph_volume/group_vars/all
index 5ffdf22bde10e05de480fa6c6135b12dbe26a381..657e3015fd994d30d9de88805342390d06ccbf19 100644 (file)
--- a/tests/functional/migrate_ceph_disk_to_ceph_volume/group_vars/all
+++ b/tests/functional/migrate_ceph_disk_to_ceph_volume/group_vars/all
@@ -5,7 +5,6 @@ ceph_repository: community
 cluster: test
 public_network: "192.168.1.0/24"
 cluster_network: "192.168.2.0/24"
-monitor_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"
 devices:

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 6101343ecd17c8d77565c7bc1cc9c5fab7940135..29709d562c4d044b7a246db8e6cd9bdac4620693 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 public_network: "192.168.30.0/24"

diff --git a/tests/functional/rbdmirror/container/group_vars/all b/tests/functional/rbdmirror/container/group_vars/all
index 54924683cdfe6a0277901d946bcbda1fe431f3e4..8db0513d95d00950a71392d114790cd8286915f1 100644 (file)
--- a/tests/functional/rbdmirror/container/group_vars/all
+++ b/tests/functional/rbdmirror/container/group_vars/all
@@ -6,7 +6,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.144.0/24"
 cluster_network: "192.168.145.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/rbdmirror/container/secondary/group_vars/all b/tests/functional/rbdmirror/container/secondary/group_vars/all
index ccc55d1cf827ecd72536c8bb6cdf345596ecc364..1c5896dcabe9370c5e07cbe246b580683359b132 100644 (file)
--- a/tests/functional/rbdmirror/container/secondary/group_vars/all
+++ b/tests/functional/rbdmirror/container/secondary/group_vars/all
@@ -6,7 +6,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.146.0/24"
 cluster_network: "192.168.147.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/rbdmirror/group_vars/all b/tests/functional/rbdmirror/group_vars/all
index 93474c1303032b989179681b64a2498c7948fa6d..ef706caa4d6967d809a965be63a4128367cb502d 100644 (file)
--- a/tests/functional/rbdmirror/group_vars/all
+++ b/tests/functional/rbdmirror/group_vars/all
@@ -4,7 +4,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.140.0/24"
 cluster_network: "192.168.141.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/rbdmirror/secondary/group_vars/all b/tests/functional/rbdmirror/secondary/group_vars/all
index 9c44e89b79cc84aaecbdb7ac76309988cad7feaf..b5bf0eaee3f1c958a1d6613a50d26c575ade0e5a 100644 (file)
--- a/tests/functional/rbdmirror/secondary/group_vars/all
+++ b/tests/functional/rbdmirror/secondary/group_vars/all
@@ -4,7 +4,6 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.142.0/24"
 cluster_network: "192.168.143.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index 43f2de24d98d1720850a479bd29e34c517575723..e0cc1865e7de10a2acca66e6cbdc424e6a543037 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 public_network: "192.168.79.0/24"
 cluster_network: "192.168.80.0/24"

diff --git a/tests/functional/shrink_mds/group_vars/all b/tests/functional/shrink_mds/group_vars/all
index 0ceff4cdbc1d534a15dda68b94425c69ddd0508b..b82aa455a937c7f7ce6e7e3eed6e96a812d19da0 100644 (file)
--- a/tests/functional/shrink_mds/group_vars/all
+++ b/tests/functional/shrink_mds/group_vars/all
@@ -3,7 +3,6 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.77.0/24"
 cluster_network: "192.168.78.0/24"
-monitor_interface: eth1
 radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index 5488b6c41aca76f29af516777e73058708148f1c..671bc426b4992026102497c719c936a7001fda65 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 public_network: "192.168.83.0/24"
 cluster_network: "192.168.84.0/24"

diff --git a/tests/functional/shrink_mgr/group_vars/all b/tests/functional/shrink_mgr/group_vars/all
index bc72091a19184df16dd0b1912fbc21c0776c21ca..9374675e217f052b9108c6240c938bb5d280a82f 100644 (file)
--- a/tests/functional/shrink_mgr/group_vars/all
+++ b/tests/functional/shrink_mgr/group_vars/all
@@ -3,7 +3,6 @@ ceph_origin: repository
 ceph_repository: dev
 public_network: "192.168.81.0/24"
 cluster_network: "192.168.82.0/24"
-monitor_interface: eth1
 radosgw_interface: eth1
 ceph_conf_overrides:
   global:

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index 2fd03e9b5e10f302d74470eafc103a3c34c2d29c..7415150db52d3b9e96477456ca5db5c6a77e40ff 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 public_network: "192.168.17.0/24"
 cluster_network: "192.168.18.0/24"

diff --git a/tests/functional/shrink_mon/hosts b/tests/functional/shrink_mon/hosts
index c0230214637576608b9e426cd9ad548c630b5dcc..5d91b7dbd07814a08d7eec90410dc5d058033aff 100644 (file)
--- a/tests/functional/shrink_mon/hosts
+++ b/tests/functional/shrink_mon/hosts
@@ -1,7 +1,7 @@
 [mons]
-mon0 monitor_address=192.168.1.10
-mon1 monitor_interface="{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
-mon2 monitor_address=192.168.1.12
+mon0
+mon1
+mon2
 
 [osds]
 osd0
\ No newline at end of file

diff --git a/tests/functional/shrink_mon/hosts-switch-to-containers b/tests/functional/shrink_mon/hosts-switch-to-containers
index b995e9b99339a09c4f2ab73005c894b42dcb8343..3ab72318efbf8db1e7f6450320e7ebe0c2c3e525 100644 (file)
--- a/tests/functional/shrink_mon/hosts-switch-to-containers
+++ b/tests/functional/shrink_mon/hosts-switch-to-containers
@@ -2,9 +2,9 @@
 docker=True
 
 [mons]
-mon0 monitor_address=192.168.1.10
-mon1 monitor_interface="{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
-mon2 monitor_address=192.168.1.12
+mon0
+mon1
+mon2
 
 [osds]
 osd0

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index 9e6f481b842709dd7c48b1e3d81089f44aa98975..1ae9358193eb2bcda907b22776e67e77b58dc136 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 public_network: "192.168.73.0/24"
 cluster_network: "192.168.74.0/24"

diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all
index 7eeffe2663bfefd0b7d540db1d9787ff6ee8976d..3fe10aa207c25f4a5810b787c02801ae7e9adff3 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -5,7 +5,6 @@ docker: True
 public_network: "192.168.87.0/24"
 cluster_network: "192.168.88.0/24"
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_conf_overrides:
   global:

diff --git a/tests/functional/shrink_rbdmirror/group_vars/all b/tests/functional/shrink_rbdmirror/group_vars/all
index 8e2437b48dcd18c51f99301a3ef197c350afdaa1..1a90c972b75e5595a20c019f7e3e51f0439b4dde 100644 (file)
--- a/tests/functional/shrink_rbdmirror/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/group_vars/all
@@ -3,7 +3,6 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.85.0/24"
 cluster_network: "192.168.86.0/24"
-monitor_interface: eth1
 osd_objectstore: "bluestore"
 copy_admin_key: true
 ceph_conf_overrides:

diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all
index 052f9ffc9fda2b4052b539784fd3e7127a6179f9..9aafb5541bba4c52cc761b56cbfb44040a2f586d 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -6,7 +6,6 @@ docker: True
 containerized_deployment: True
 public_network: "192.168.91.0/24"
 cluster_network: "192.168.92.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_conf_overrides:

diff --git a/tests/functional/shrink_rgw/group_vars/all b/tests/functional/shrink_rgw/group_vars/all
index f67e9215405d507afc103cd5b254600df4aebd96..26bfeb7d1037868d0a243fbe4dd0e4ab24e3a9a3 100644 (file)
--- a/tests/functional/shrink_rgw/group_vars/all
+++ b/tests/functional/shrink_rgw/group_vars/all
@@ -3,7 +3,6 @@ ceph_origin: repository
 ceph_repository: dev
 public_network: "192.168.89.0/24"
 cluster_network: "192.168.90.0/24"
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 copy_admin_key: true

diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all
index 4b8941b96ff9eae8eaeaee1ff3929189b44fdfe6..ad86c04010555ccc826900884b97a4d3794c9971 100644 (file)
--- a/tests/functional/subset_update/container/group_vars/all
+++ b/tests/functional/subset_update/container/group_vars/all
@@ -4,7 +4,6 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 public_network: "192.168.5.0/24"

diff --git a/tests/functional/subset_update/container/hosts b/tests/functional/subset_update/container/hosts
index e7d4fa615cc12347c959661a2b6f82e98f0bab13..8823f1a85b132ad8784708e75e5c4be46cb1db53 100644 (file)
--- a/tests/functional/subset_update/container/hosts
+++ b/tests/functional/subset_update/container/hosts
@@ -1,7 +1,7 @@
 [mons]
-mon0 monitor_address=192.168.5.10
-mon1 monitor_interface="{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
-mon2 monitor_address=192.168.5.12
+mon0
+mon1
+mon2
 
 [mgrs]
 mon0

diff --git a/tests/functional/subset_update/hosts b/tests/functional/subset_update/hosts
index 18669ec1dbfdec1ce3c10fa4a96667f25a7d4051..ce6362946899137482a8b68628dab466f3dac743 100644 (file)
--- a/tests/functional/subset_update/hosts
+++ b/tests/functional/subset_update/hosts
@@ -1,7 +1,7 @@
 [mons]
-mon0 monitor_address=192.168.3.10
-mon1 monitor_interface="{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
-mon2 monitor_address=192.168.3.12
+mon0
+mon1
+mon2
 
 [mgrs]
 mon0