From ce7431a2276d067fffcfdc372d5263cd35f379e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 14 Dec 2016 21:22:13 +0100 Subject: [PATCH] docker: add support for cluster name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We need to honour the cluster name that was chosen by ceph-ansible and pass it to ceph-docker. Signed-off-by: Sébastien Han --- group_vars/mdss.yml.sample | 2 +- group_vars/mons.yml.sample | 2 +- group_vars/osds.yml.sample | 4 ++-- group_vars/rgws.yml.sample | 2 +- roles/ceph-mds/defaults/main.yml | 2 +- roles/ceph-mon/defaults/main.yml | 2 +- roles/ceph-osd/defaults/main.yml | 4 ++-- roles/ceph-osd/tasks/docker/start_docker_osd.yml | 2 +- roles/ceph-rgw/defaults/main.yml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/group_vars/mdss.yml.sample b/group_vars/mdss.yml.sample index 303989cde..4d0072aa0 100644 --- a/group_vars/mdss.yml.sample +++ b/group_vars/mdss.yml.sample @@ -35,7 +35,7 @@ dummy: #ceph_mds_docker_username: ceph #ceph_mds_docker_imagename: daemon #ceph_mds_docker_image_tag: latest -#ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables +#ceph_mds_docker_extra_env: "CLUSTER={{ cluster }},MDS_NAME={{ ansible_hostname }}" # comma separated variables #ceph_docker_on_openstack: false #ceph_config_keys: [] # DON'T TOUCH ME diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample index 5edd1cdd3..b4877629f 100644 --- a/group_vars/mons.yml.sample +++ b/group_vars/mons.yml.sample @@ -85,7 +85,7 @@ dummy: #ceph_mon_docker_username: ceph #ceph_mon_docker_imagename: daemon #ceph_mon_docker_image_tag: latest -#ceph_mon_extra_envs: "FSID={{ fsid }},MON_NAME={{ ansible_hostname }}" # comma separated variables +#ceph_mon_extra_envs: "CLUSTER={{ cluster }},FSID={{ fsid }},MON_NAME={{ ansible_hostname }}" # comma separated variables #ceph_docker_on_openstack: false #mon_docker_privileged: false #mon_docker_net_host: true diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample index 35d6f1a00..5184f706d 100644 --- a/group_vars/osds.yml.sample +++ b/group_vars/osds.yml.sample @@ -175,11 +175,11 @@ dummy: #kv_type: etcd #kv_endpoint: 127.0.0.1 #kv_port: 4001 -#ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1" +#ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 #ceph_osd_docker_username: ceph #ceph_osd_docker_imagename: daemon #ceph_osd_docker_image_tag: latest -#ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE,OSD_JOURNAL_SIZE={{ journal_size }}" # comma separated variables +#ceph_osd_docker_extra_env: "CLUSTER={{ cluster }},CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE,OSD_JOURNAL_SIZE={{ journal_size }}" # comma separated variables #ceph_osd_docker_devices: "{{ devices }}" #ceph_docker_on_openstack: false #ceph_config_keys: [] # DON'T TOUCH ME diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample index bf98e26bc..aa14a518d 100644 --- a/group_vars/rgws.yml.sample +++ b/group_vars/rgws.yml.sample @@ -42,7 +42,7 @@ dummy: #ceph_rgw_docker_username: ceph #ceph_rgw_docker_imagename: daemon #ceph_rgw_docker_image_tag: latest -#ceph_rgw_docker_extra_env: "RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables +#ceph_rgw_docker_extra_env: "CLUSTER={{ cluster }},RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables #ceph_docker_on_openstack: false #ceph_config_keys: [] # DON'T TOUCH ME #rgw_config_keys: "/" # DON'T TOUCH ME diff --git a/roles/ceph-mds/defaults/main.yml b/roles/ceph-mds/defaults/main.yml index e59e7208f..65d0f39bc 100644 --- a/roles/ceph-mds/defaults/main.yml +++ b/roles/ceph-mds/defaults/main.yml @@ -27,6 +27,6 @@ kv_endpoint: 127.0.0.1 ceph_mds_docker_username: ceph ceph_mds_docker_imagename: daemon ceph_mds_docker_image_tag: latest -ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables +ceph_mds_docker_extra_env: "CLUSTER={{ cluster }},MDS_NAME={{ ansible_hostname }}" # comma separated variables ceph_docker_on_openstack: false ceph_config_keys: [] # DON'T TOUCH ME diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml index dc7d2a5bf..231d05fae 100644 --- a/roles/ceph-mon/defaults/main.yml +++ b/roles/ceph-mon/defaults/main.yml @@ -77,7 +77,7 @@ ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_in ceph_mon_docker_username: ceph ceph_mon_docker_imagename: daemon ceph_mon_docker_image_tag: latest -ceph_mon_extra_envs: "FSID={{ fsid }},MON_NAME={{ ansible_hostname }}" # comma separated variables +ceph_mon_extra_envs: "CLUSTER={{ cluster }},FSID={{ fsid }},MON_NAME={{ ansible_hostname }}" # comma separated variables ceph_docker_on_openstack: false mon_docker_privileged: false mon_docker_net_host: true diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml index 1fec4633f..4ecb95a67 100644 --- a/roles/ceph-osd/defaults/main.yml +++ b/roles/ceph-osd/defaults/main.yml @@ -167,11 +167,11 @@ osd_containerized_deployment_with_kv: false kv_type: etcd kv_endpoint: 127.0.0.1 kv_port: 4001 -ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1" +ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 ceph_osd_docker_username: ceph ceph_osd_docker_imagename: daemon ceph_osd_docker_image_tag: latest -ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE,OSD_JOURNAL_SIZE={{ journal_size }}" # comma separated variables +ceph_osd_docker_extra_env: "CLUSTER={{ cluster }},CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE,OSD_JOURNAL_SIZE={{ journal_size }}" # comma separated variables ceph_osd_docker_devices: "{{ devices }}" ceph_docker_on_openstack: false ceph_config_keys: [] # DON'T TOUCH ME diff --git a/roles/ceph-osd/tasks/docker/start_docker_osd.yml b/roles/ceph-osd/tasks/docker/start_docker_osd.yml index 34c9f6c3f..88b520b53 100644 --- a/roles/ceph-osd/tasks/docker/start_docker_osd.yml +++ b/roles/ceph-osd/tasks/docker/start_docker_osd.yml @@ -31,8 +31,8 @@ -v /dev:/dev \ -v /etc/localtime:/etc/localtime:ro \ -e "OSD_DEVICE={{ item.0 }}" \ - -e "{{ ceph_osd_docker_prepare_env }}" \ -e CEPH_DAEMON=OSD_CEPH_DISK_PREPARE \ + {{ ceph_osd_docker_prepare_env }} \ "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}" with_together: - "{{ ceph_osd_docker_devices }}" diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml index 78be7a6fd..3fa0d2a19 100644 --- a/roles/ceph-rgw/defaults/main.yml +++ b/roles/ceph-rgw/defaults/main.yml @@ -34,7 +34,7 @@ ceph_rgw_civetweb_port: "{{ radosgw_civetweb_port }}" ceph_rgw_docker_username: ceph ceph_rgw_docker_imagename: daemon ceph_rgw_docker_image_tag: latest -ceph_rgw_docker_extra_env: "RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables +ceph_rgw_docker_extra_env: "CLUSTER={{ cluster }},RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables ceph_docker_on_openstack: false ceph_config_keys: [] # DON'T TOUCH ME rgw_config_keys: "/" # DON'T TOUCH ME -- 2.39.5