docker: use cluster name

Fix cluster name for docker scenario and other playbooks.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-common/templates/s3gw.fcgi.j2 b/roles/ceph-common/templates/s3gw.fcgi.j2
index f309fff7f2fe9d53bf994af75deff56fa9e066d0..c1899e2f6991d72de927c6900fb7047f7e58ea28 100644 (file)
--- a/roles/ceph-common/templates/s3gw.fcgi.j2
+++ b/roles/ceph-common/templates/s3gw.fcgi.j2
@@ -1,3 +1,3 @@
 # {{ ansible_managed }}
 #!/bin/sh
-exec /usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.radosgw.{{ ansible_hostname }}
+exec /usr/bin/radosgw -c /etc/ceph/{{ cluster }}.conf -n client.radosgw.{{ ansible_hostname }}

diff --git a/roles/ceph-mds/tasks/docker/checks.yml b/roles/ceph-mds/tasks/docker/checks.yml
index 255a6d01aa2b8fae649bee9a6bcf3b0bbe6f5161..53ea48053d68dd88eced629ecaeb4618d8596343 100644 (file)
--- a/roles/ceph-mds/tasks/docker/checks.yml
+++ b/roles/ceph-mds/tasks/docker/checks.yml
@@ -2,13 +2,13 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.client.admin.keyring
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/monmap
-      - /etc/ceph/ceph.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/ceph.keyring
-      - /var/lib/ceph/bootstrap-rgw/ceph.keyring
-      - /var/lib/ceph/bootstrap-mds/ceph.keyring
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/monmap-{{ cluster }}
+      - /etc/ceph/{{ cluster }}.mon.keyring
+      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
 
 - name: stat for ceph config and keys
   stat:

diff --git a/roles/ceph-mds/tasks/docker/fetch_configs.yml b/roles/ceph-mds/tasks/docker/fetch_configs.yml
index 03a376899dca2dc03c3619cb051fe5bdca22e8c5..7153506f7347ebedafbccaa05475a27650b02cbf 100644 (file)
--- a/roles/ceph-mds/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-mds/tasks/docker/fetch_configs.yml
@@ -4,9 +4,9 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/ceph.client.admin.keyring
-      - /var/lib/ceph/bootstrap-mds/ceph.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
 
 - name: stat for ceph config and keys
   local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

diff --git a/roles/ceph-mon/tasks/docker/checks.yml b/roles/ceph-mon/tasks/docker/checks.yml
index 255a6d01aa2b8fae649bee9a6bcf3b0bbe6f5161..53ea48053d68dd88eced629ecaeb4618d8596343 100644 (file)
--- a/roles/ceph-mon/tasks/docker/checks.yml
+++ b/roles/ceph-mon/tasks/docker/checks.yml
@@ -2,13 +2,13 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.client.admin.keyring
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/monmap
-      - /etc/ceph/ceph.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/ceph.keyring
-      - /var/lib/ceph/bootstrap-rgw/ceph.keyring
-      - /var/lib/ceph/bootstrap-mds/ceph.keyring
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/monmap-{{ cluster }}
+      - /etc/ceph/{{ cluster }}.mon.keyring
+      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
 
 - name: stat for ceph config and keys
   stat:

diff --git a/roles/ceph-mon/tasks/docker/create_configs.yml b/roles/ceph-mon/tasks/docker/create_configs.yml
index c2b0508c61ef05787ba484d60654cd09d6d71074..0b8143690239fdfc11a58795042ee9098f724608 100644 (file)
--- a/roles/ceph-mon/tasks/docker/create_configs.yml
+++ b/roles/ceph-mon/tasks/docker/create_configs.yml
@@ -25,7 +25,7 @@
   action: config_template
   args:
     src: "{{ playbook_dir }}/roles/ceph-common/templates/ceph.conf.j2"
-    dest: /etc/ceph/ceph.conf
+    dest: "/etc/ceph/{{ cluster }}.conf"
     owner: "root"
     group: "root"
     mode: "0644"

diff --git a/roles/ceph-mon/tasks/docker/fetch_configs.yml b/roles/ceph-mon/tasks/docker/fetch_configs.yml
index 46384d009d15d2f7fed941d6237b9d54b9f175f8..63c8b3c459b99693ff810f73df8e0502fb7994ec 100644 (file)
--- a/roles/ceph-mon/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-mon/tasks/docker/fetch_configs.yml
@@ -2,13 +2,13 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/ceph.client.admin.keyring
-      - /etc/ceph/monmap
-      - /etc/ceph/ceph.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/ceph.keyring
-      - /var/lib/ceph/bootstrap-rgw/ceph.keyring
-      - /var/lib/ceph/bootstrap-mds/ceph.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /etc/ceph/monmap-{{ cluster }}
+      - /etc/ceph/{{ cluster }}.mon.keyring
+      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
 
 - name: stat for ceph config and keys
   local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

diff --git a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
index f3754a850b876a12ccc41b57b0b57ac6acb93b2d..c6c5e402a58a72c6998966b00dee7d0080014bcd 100644 (file)
--- a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
+++ b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
@@ -26,7 +26,7 @@
       KV_IP: "{{kv_endpoint}}"
       KV_PORT: "{{kv_port}}"
     volumes:
-      - /etc/ceph/ceph.conf:/etc/ceph/ceph.defaults
+      - /etc/ceph/"{{ cluster }}".conf:/etc/ceph/ceph.defaults
   run_once: true
   when:
     - inventory_hostname == groups.mons[0]
@@ -74,7 +74,7 @@
 
 - name: wait for ceph.conf exists
   wait_for:
-      path: /etc/ceph/ceph.conf
+      path: "/etc/ceph/{{ cluster }}.conf"
   when: ansible_os_family == 'RedHat'
 
 - name: run the ceph monitor docker image

diff --git a/roles/ceph-nfs/tasks/docker/checks.yml b/roles/ceph-nfs/tasks/docker/checks.yml
index 5559e7f4a88042ea5b33c33a85c7dc7c380fb2f1..992fc0e336620739970eb48979953501dc1038ac 100644 (file)
--- a/roles/ceph-nfs/tasks/docker/checks.yml
+++ b/roles/ceph-nfs/tasks/docker/checks.yml
@@ -2,10 +2,10 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.client.admin.keyring
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/monmap
-      - /etc/ceph/ceph.mon.keyring
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/monmap-{{ cluster }}
+      - /etc/ceph/{{ cluster }}.mon.keyring
       - /etc/ganesha/ganesha.conf
 
 - name: stat for ceph config and keys

diff --git a/roles/ceph-nfs/tasks/docker/copy_configs.yml b/roles/ceph-nfs/tasks/docker/copy_configs.yml
index 8f1f3835afa5e74512028ef5eaa4bfaa831e428f..6b37760b3193f3482259ae6dbe7550235698d70c 100644 (file)
--- a/roles/ceph-nfs/tasks/docker/copy_configs.yml
+++ b/roles/ceph-nfs/tasks/docker/copy_configs.yml
@@ -2,8 +2,8 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/ceph.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
       - /var/lib/ceph/radosgw/keyring
 
 - name: stat for config and keys

diff --git a/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml b/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
index 7e0196c93a6f2e2aba78a6df15a3242ed7a4bf98..137efa90eb4c8fb1dfa8232b5fa09cfb64ff5dc1 100644 (file)
--- a/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
+++ b/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
@@ -49,7 +49,7 @@
 
 - name: wait for ceph.conf exists
   wait_for:
-      path: /etc/ceph/ceph.conf
+      path: "/etc/ceph/{{ cluster }}.conf"
   when: is_atomic
 
 - name: run the ceph NFS docker image

diff --git a/roles/ceph-osd/tasks/docker/checks.yml b/roles/ceph-osd/tasks/docker/checks.yml
index 255a6d01aa2b8fae649bee9a6bcf3b0bbe6f5161..53ea48053d68dd88eced629ecaeb4618d8596343 100644 (file)
--- a/roles/ceph-osd/tasks/docker/checks.yml
+++ b/roles/ceph-osd/tasks/docker/checks.yml
@@ -2,13 +2,13 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.client.admin.keyring
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/monmap
-      - /etc/ceph/ceph.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/ceph.keyring
-      - /var/lib/ceph/bootstrap-rgw/ceph.keyring
-      - /var/lib/ceph/bootstrap-mds/ceph.keyring
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/monmap-{{ cluster }}
+      - /etc/ceph/{{ cluster }}.mon.keyring
+      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
 
 - name: stat for ceph config and keys
   stat:

diff --git a/roles/ceph-osd/tasks/docker/fetch_configs.yml b/roles/ceph-osd/tasks/docker/fetch_configs.yml
index 970519807a391676c8c82329d623d9423c421f46..540dad17f2063a9eea51c12dff1f8bc7d8345ab7 100644 (file)
--- a/roles/ceph-osd/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-osd/tasks/docker/fetch_configs.yml
@@ -2,8 +2,8 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.conf
-      - /var/lib/ceph/bootstrap-osd/ceph.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
 
 - name: wait for ceph.conf and keys
   local_action: >

diff --git a/roles/ceph-rbd-mirror/tasks/docker/checks.yml b/roles/ceph-rbd-mirror/tasks/docker/checks.yml
index 255a6d01aa2b8fae649bee9a6bcf3b0bbe6f5161..53ea48053d68dd88eced629ecaeb4618d8596343 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/docker/checks.yml
+++ b/roles/ceph-rbd-mirror/tasks/docker/checks.yml
@@ -2,13 +2,13 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.client.admin.keyring
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/monmap
-      - /etc/ceph/ceph.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/ceph.keyring
-      - /var/lib/ceph/bootstrap-rgw/ceph.keyring
-      - /var/lib/ceph/bootstrap-mds/ceph.keyring
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/monmap-{{ cluster }}
+      - /etc/ceph/{{ cluster }}.mon.keyring
+      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
 
 - name: stat for ceph config and keys
   stat:

diff --git a/roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml b/roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml
index b8b1ea6ce42de76cd038d591dd5f3321c82245a7..91afa69fa2426fa4675b88fd5afec5a339c14c9b 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml
@@ -4,8 +4,8 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/ceph.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
 
 - name: stat for ceph config and keys
   local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

diff --git a/roles/ceph-restapi/tasks/docker/fetch_configs.yml b/roles/ceph-restapi/tasks/docker/fetch_configs.yml
index 8af56884ec106d370fd29dcea20c947e7c2d668f..8cbdc1d31360de03966a12152f5bcdb6aa9ade78 100644 (file)
--- a/roles/ceph-restapi/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-restapi/tasks/docker/fetch_configs.yml
@@ -2,8 +2,8 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/ceph.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
 
 - name: stat for ceph config and keys
   local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

diff --git a/roles/ceph-rgw/tasks/docker/checks.yml b/roles/ceph-rgw/tasks/docker/checks.yml
index 255a6d01aa2b8fae649bee9a6bcf3b0bbe6f5161..53ea48053d68dd88eced629ecaeb4618d8596343 100644 (file)
--- a/roles/ceph-rgw/tasks/docker/checks.yml
+++ b/roles/ceph-rgw/tasks/docker/checks.yml
@@ -2,13 +2,13 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.client.admin.keyring
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/monmap
-      - /etc/ceph/ceph.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/ceph.keyring
-      - /var/lib/ceph/bootstrap-rgw/ceph.keyring
-      - /var/lib/ceph/bootstrap-mds/ceph.keyring
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/monmap-{{ cluster }}
+      - /etc/ceph/{{ cluster }}.mon.keyring
+      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
 
 - name: stat for ceph config and keys
   stat:

diff --git a/roles/ceph-rgw/tasks/docker/fetch_configs.yml b/roles/ceph-rgw/tasks/docker/fetch_configs.yml
index 6902b591900ee38ed277e1094704086cdedd71a3..9b0e9544e2121f35fee1b88419c99faa1d9ce7bc 100644 (file)
--- a/roles/ceph-rgw/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-rgw/tasks/docker/fetch_configs.yml
@@ -2,8 +2,8 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/ceph.conf
-      - /var/lib/ceph/bootstrap-rgw/ceph.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
 
 - name: stat for ceph config and keys
   local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

diff --git a/roles/ceph-rgw/tasks/multisite/destroy.yml b/roles/ceph-rgw/tasks/multisite/destroy.yml
index db1226130daf7fd1d30c57f054a710b235806841..de3c63715816e1d5c47cebafdac74a2839432f66 100644 (file)
--- a/roles/ceph-rgw/tasks/multisite/destroy.yml
+++ b/roles/ceph-rgw/tasks/multisite/destroy.yml
@@ -9,7 +9,7 @@
   run_once: true
   failed_when: false
 
-- name: delete the zonegroup 
+- name: delete the zonegroup
   command: radosgw-admin zonegroup delete --rgw-zonegroup={{ rgw_zonegroup }}
   run_once: true
   failed_when: false
@@ -21,7 +21,7 @@
 
 - name: delete zone from rgw stanza in ceph.conf
   lineinfile:
-    dest: /etc/ceph/ceph.conf
+    dest: "/etc/ceph/{{ cluster }}.conf"
     regexp: "rgw_zone = {{ rgw_zonegroup }}-{{ rgw_zone }}"
     state: absent
   when: "rgw_zone is defined and rgw_zonegroup is defined"

diff --git a/roles/ceph-rgw/tasks/multisite/main.yml b/roles/ceph-rgw/tasks/multisite/main.yml
index cc874ba00d188a39d861b20d90adfd66fbd0fbab..0dc6d94da096a83e39b79d3092f2c4dae2430354 100644 (file)
--- a/roles/ceph-rgw/tasks/multisite/main.yml
+++ b/roles/ceph-rgw/tasks/multisite/main.yml
@@ -18,7 +18,7 @@
 # Continue with common tasks
 - name: add zone to rgw stanza in ceph.conf
   lineinfile:
-    dest: /etc/ceph/ceph.conf
+    dest: "/etc/ceph/{{ cluster }}.conf"
     regexp: "{{ ansible_host }}"
     insertafter: "^[client.rgw.{{ ansible_host }}]"
     line: "rgw_zone = {{ rgw_zone }}"