From 0c59d7cdcdb5f3154963188df8ca2def4a4d01d0 Mon Sep 17 00:00:00 2001 From: Ivan Font Date: Thu, 26 Jan 2017 15:50:49 -0800 Subject: [PATCH] Update all docker sample extra environment vars Bring docker sample extra environment variables in sync with the global defaults for each role. Previous definitions were no longer used. --- group_vars/all.docker.yml.sample | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/group_vars/all.docker.yml.sample b/group_vars/all.docker.yml.sample index 6cbc93a58..9752f04ef 100644 --- a/group_vars/all.docker.yml.sample +++ b/group_vars/all.docker.yml.sample @@ -23,7 +23,7 @@ dummy: #ceph_mon_docker_image_tag: latest #ceph_mon_docker_interface: "{{ monitor_interface }}" #ceph_mon_docker_subnet: "{{ public_network }}" # subnet of the ceph_mon_docker_interface -#ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables +#ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ ansible_hostname }} ####### # OSD # @@ -35,7 +35,7 @@ dummy: #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" # comma separated variables +#ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_JOURNAL_SIZE={{ journal_size }} #ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1" # comma separated variables #ceph_osd_docker_devices: # - /dev/sdb @@ -54,7 +54,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: -e CLUSTER={{ cluster }} -e MDS_NAME={{ ansible_hostname }} ####### # RGW # @@ -67,7 +67,7 @@ dummy: #ceph_rgw_docker_imagename: daemon #ceph_rgw_docker_image_tag: latest #ceph_rgw_civetweb_port: 80 -#ceph_rgw_docker_extra_env: "RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables +#ceph_rgw_docker_extra_env: -e CLUSTER={{ cluster }} -e RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }} ########### # RESTAPI # @@ -101,7 +101,7 @@ dummy: #ceph_nfs_docker_username: ceph #ceph_nfs_docker_imagename: daemon #ceph_nfs_docker_image_tag: latest -#ceph_nfs_docker_extra_env: "GANESHA_EPOCH={{ ganesha_epoch }}" # comma separated variables +#ceph_nfs_docker_extra_env: -e GANESHA_EPOCH={{ ganesha_epoch }} #nfs_file_gw: false #nfs_obj_gw: false #ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY" -- 2.39.5