Refact: remove ceph_mon_docker_interface variable

remove `ceph_mon_docker_interface` and use `monitor_interface` instead
for both containerized and non-containerized deployment.

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

diff --git a/Vagrantfile b/Vagrantfile
index 19d93e8fc0db21ae17ee7fadee3f779c37363bdf..3fa25cf3b223553806dfda0967d025df912c75a9 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -74,7 +74,7 @@ ansible_provision = proc do |ansible|
   if DOCKER then
     ansible.extra_vars = ansible.extra_vars.merge({
       containerized_deployment: 'true',
-      ceph_mon_docker_interface: ETH,
+      monitor_interface: ETH,
       ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24",
       ceph_osd_docker_devices: settings['disks'],
       devices: settings['disks'],

diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
index 8244d650e1f5cfd300cac6eb8d3d9dd9ca7c8e62..4ed18e5b5a7ed141db68ab9cb96d5a9105812b31 100644 (file)
--- a/group_vars/mons.yml.sample
+++ b/group_vars/mons.yml.sample
@@ -87,8 +87,7 @@ dummy:
 # DOCKER #
 ##########
 #docker_exec_cmd:
-#ceph_mon_docker_interface: "{{ monitor_interface }}"
-#ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
+#ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the monitor_interface
 #ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ monitor_name }}
 #mon_docker_privileged: false
 #mon_docker_net_host: true

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index 5dcc196ce37cd2b02ab773cc116cc4f824ee362d..adee1e9712035d26c6f51f8cc0deb8f29d3ea7cd 100644 (file)
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -150,7 +150,7 @@
       net: "host"
       state: "running"
       privileged: "{{ mon_docker_privileged }}"
-      env: "MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},CEPH_FSID={{ ceph_fsid.stdout }},{{ ceph_mon_docker_extra_env }}"
+      env: "MON_IP={{ hostvars[inventory_hostname]['ansible_' + monitor_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},CEPH_FSID={{ ceph_fsid.stdout }},{{ ceph_mon_docker_extra_env }}"
       volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/etc/localtime:/etc/localtime:ro"
 
   - name: waiting for the monitor to join the quorum...

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 1434ae2400e9cf3b9da79e2baadd522370a9b02e..eec6029c3d1411d207caa60d39537275728b07ea 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -71,7 +71,7 @@ mon host = {% for host in groups[mon_group_name] -%}
         [{{ hostvars[host]['monitor_address'] }}]
       {%- endif %}
     {%- else -%}
-      {% set interface = ["ansible_",ceph_mon_docker_interface]|join %}
+      {% set interface = ["ansible_",monitor_interface]|join %}
       {% if ip_version == 'ipv4' -%}
         {{ hostvars[host][interface][ip_version]['address'] }}
       {%- elif ip_version == 'ipv6' -%}

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 629b8b9248d8354e340d10afb92a8f56d3c7ba94..e64de8a43f41490ac43926815ae2d8503a9d774e 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -79,8 +79,7 @@ openstack_keys:
 # DOCKER #
 ##########
 docker_exec_cmd:
-ceph_mon_docker_interface: "{{ monitor_interface }}"
-ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
+ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the monitor_interface
 ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ monitor_name }}
 mon_docker_privileged: false
 mon_docker_net_host: true

diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 1f9130b8f2876490120d9191f18790a8d2a0e103..1a2f99a05b9d26c8e8f319541693a16ad4ff3004 100644 (file)
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -13,7 +13,7 @@
   until: monitor_socket.rc == 0
 
 - name: force peer addition as potential bootstrap peer for cluster bringup
-  command: docker exec ceph-mon-{{ ansible_hostname }} ceph --admin-daemon /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok add_bootstrap_peer_hint {{ hostvars[item]['ansible_' + ceph_mon_docker_interface].ipv4.address }}
+  command: docker exec ceph-mon-{{ ansible_hostname }} ceph --admin-daemon /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok add_bootstrap_peer_hint {{ hostvars[item]['ansible_' + monitor_interface].ipv4.address }}
   with_items: "{{ groups[mon_group_name] }}"
   changed_when: false
   failed_when: false

diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2
index 74457aa2e581625510c651255bae4db6c588a31a..a5f790f27b9fe77ed779270bcca837c8b124f2be 100644 (file)
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -32,9 +32,9 @@ ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i --net=host \
        -e MON_IP=[{{ monitor_address }}] \
      {% endif -%}
    {% elif ip_version == 'ipv4' -%}
-   -e MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface][ip_version]['address'] }} \
+   -e MON_IP={{ hostvars[inventory_hostname]['ansible_' + monitor_interface][ip_version]['address'] }} \
    {% elif ip_version =='ipv6' -%}
-   -e MON_IP=[{{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface][ip_version][0]['address'] }}] \
+   -e MON_IP=[{{ hostvars[inventory_hostname]['ansible_' + monitor_interface][ip_version][0]['address'] }}] \
    {% endif -%}
    {{ ceph_mon_docker_extra_env }} \
    {{ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}

diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile b/tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile
index 3fa4b55bf3ed60fdb8555606fb517be40fb227d7..0ba579791098950c468efcbd97b54fe9651150e0 100644 (file)
--- a/tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile
+++ b/tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile
@@ -73,7 +73,7 @@ ansible_provision = proc do |ansible|
   if DOCKER then
     ansible.extra_vars = ansible.extra_vars.merge({
       containerized_deployment: 'true',
-      ceph_mon_docker_interface: ETH,
+      monitor_interface: ETH,
       ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24",
       ceph_osd_docker_devices: settings['disks'],
       devices: settings['disks'],

diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all b/tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all
index e5950afc3eba7020db5c5fecfc31c017c9ec5352..8bb92b26bae166488b2b3c6147186cc5dd95ab15 100644 (file)
--- a/tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all
+++ b/tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all
@@ -6,7 +6,7 @@ docker: True
 ceph_stable: True
 containerized_deployment: True
 cluster: test
-ceph_mon_docker_interface: eth1
+monitor_interface: eth1
 ceph_mon_docker_subnet: "{{ public_network }}"
 journal_size: 100
 ceph_docker_on_openstack: False

diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile b/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile
index 3fa4b55bf3ed60fdb8555606fb517be40fb227d7..0ba579791098950c468efcbd97b54fe9651150e0 100644 (file)
--- a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile
+++ b/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile
@@ -73,7 +73,7 @@ ansible_provision = proc do |ansible|
   if DOCKER then
     ansible.extra_vars = ansible.extra_vars.merge({
       containerized_deployment: 'true',
-      ceph_mon_docker_interface: ETH,
+      monitor_interface: ETH,
       ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24",
       ceph_osd_docker_devices: settings['disks'],
       devices: settings['disks'],

diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all b/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all
index 926e92d11948aad2ea13fee57683539c7b481004..92e2b0f5a68aae46cf8a293fddd51cc5d23ba97d 100644 (file)
--- a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all
+++ b/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all
@@ -6,7 +6,7 @@ docker: True
 ceph_stable: True
 containerized_deployment: True
 cluster: ceph
-ceph_mon_docker_interface: eth1
+monitor_interface: eth1
 ceph_mon_docker_subnet: "{{ public_network }}"
 journal_size: 100
 ceph_docker_on_openstack: False

diff --git a/tests/functional/centos/7/docker-cluster/group_vars/all b/tests/functional/centos/7/docker-cluster/group_vars/all
index c9acef0a206dc58a6589d8da92b4eced50ed52b0..3a078510d695080a7261ce15b38d2c3ae9d654ea 100644 (file)
--- a/tests/functional/centos/7/docker-cluster/group_vars/all
+++ b/tests/functional/centos/7/docker-cluster/group_vars/all
@@ -6,7 +6,7 @@ docker: True
 ceph_stable: True
 containerized_deployment: True
 cluster: test
-ceph_mon_docker_interface: eth1
+monitor_interface: eth1
 ceph_mon_docker_subnet: "{{ public_network }}"
 journal_size: 100
 ceph_docker_on_openstack: False