From f35132989776f81f52d9e1fff547536823249b58 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 23 Aug 2016 12:03:05 +0200 Subject: [PATCH] docker: use cluster name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix cluster name for docker scenario and other playbooks. Signed-off-by: Sébastien Han --- roles/ceph-common/templates/s3gw.fcgi.j2 | 2 +- roles/ceph-mds/tasks/docker/checks.yml | 14 +++++++------- roles/ceph-mds/tasks/docker/fetch_configs.yml | 6 +++--- roles/ceph-mon/tasks/docker/checks.yml | 14 +++++++------- roles/ceph-mon/tasks/docker/create_configs.yml | 2 +- roles/ceph-mon/tasks/docker/fetch_configs.yml | 14 +++++++------- .../ceph-mon/tasks/docker/start_docker_monitor.yml | 4 ++-- roles/ceph-nfs/tasks/docker/checks.yml | 8 ++++---- roles/ceph-nfs/tasks/docker/copy_configs.yml | 4 ++-- roles/ceph-nfs/tasks/docker/start_docker_nfs.yml | 2 +- roles/ceph-osd/tasks/docker/checks.yml | 14 +++++++------- roles/ceph-osd/tasks/docker/fetch_configs.yml | 4 ++-- roles/ceph-rbd-mirror/tasks/docker/checks.yml | 14 +++++++------- .../ceph-rbd-mirror/tasks/docker/fetch_configs.yml | 4 ++-- roles/ceph-restapi/tasks/docker/fetch_configs.yml | 4 ++-- roles/ceph-rgw/tasks/docker/checks.yml | 14 +++++++------- roles/ceph-rgw/tasks/docker/fetch_configs.yml | 4 ++-- roles/ceph-rgw/tasks/multisite/destroy.yml | 4 ++-- roles/ceph-rgw/tasks/multisite/main.yml | 2 +- 19 files changed, 67 insertions(+), 67 deletions(-) diff --git a/roles/ceph-common/templates/s3gw.fcgi.j2 b/roles/ceph-common/templates/s3gw.fcgi.j2 index f309fff7f..c1899e2f6 100644 --- 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 255a6d01a..53ea48053 100644 --- 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 03a376899..7153506f7 100644 --- 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 255a6d01a..53ea48053 100644 --- 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 c2b0508c6..0b8143690 100644 --- 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 46384d009..63c8b3c45 100644 --- 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 f3754a850..c6c5e402a 100644 --- 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 5559e7f4a..992fc0e33 100644 --- 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 8f1f3835a..6b37760b3 100644 --- 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 7e0196c93..137efa90e 100644 --- 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 255a6d01a..53ea48053 100644 --- 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 970519807..540dad17f 100644 --- 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 255a6d01a..53ea48053 100644 --- 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 b8b1ea6ce..91afa69fa 100644 --- 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 8af56884e..8cbdc1d31 100644 --- 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 255a6d01a..53ea48053 100644 --- 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 6902b5919..9b0e9544e 100644 --- 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 db1226130..de3c63715 100644 --- 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 cc874ba00..0dc6d94da 100644 --- 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 }}" -- 2.39.5