From: Sébastien Han Date: Tue, 6 Dec 2016 16:28:30 +0000 (+0100) Subject: docker: consolidate ceph-ansible and ceph-docker varible X-Git-Tag: v2.1.0~17^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=75cb74957097e326d4840bbe47380724e6c8179b;p=ceph-ansible.git docker: consolidate ceph-ansible and ceph-docker varible This commit re-uses some of the existing ceph-ansible variables for a containirzed deployment. There is no reasons why we should add new variables for the containerized deployment. Signed-off-by: Sébastien Han --- diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 21678d573..9c965e44a 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -252,6 +252,7 @@ dummy: #monitor_interface: interface #monitor_address: 0.0.0.0 #mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf +#monitor_address_block: false ## OSD options # @@ -349,25 +350,6 @@ dummy: #mon_containerized_deployment: false #mon_containerized_default_ceph_conf_with_kv: false - -################## -# Temporary Vars # -################## -# NOTE(SamYaple): These vars are set here to they are defined before use. They -# should be removed after a refactor has properly seperated all the checks into -# the appropriate roles. - -#journal_collocation: False -#raw_multi_journal: False -#osd_directory: False -#bluestore: False -#dmcrypt_journal_collocation: False -#dmcrypt_dedicated_journal: False -#raw_journal_devices: [] -#devices: [] - -#osd_auto_discovery: False - # Confiure the type of NFS gatway access. At least one must be enabled for an # NFS role to be useful # @@ -375,3 +357,4 @@ dummy: #nfs_file_gw: true # Set this to true to enable Object access via NFS. Requires an RGW role. #nfs_obj_gw: false + diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample index 5bd1cde79..5edd1cdd3 100644 --- a/group_vars/mons.yml.sample +++ b/group_vars/mons.yml.sample @@ -80,12 +80,12 @@ dummy: #mon_containerized_deployment_with_kv: false # This is currently in ceph-common defaults because it is shared with ceph-nfs #mon_containerized_default_ceph_conf_with_kv: false -#ceph_mon_docker_interface: eth0 -#ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface +#ceph_mon_docker_interface: "{{ monitor_interface }}" +#ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface #ceph_mon_docker_username: ceph #ceph_mon_docker_imagename: daemon #ceph_mon_docker_image_tag: latest -#ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables +#ceph_mon_extra_envs: "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 b1eb4f91c..35d6f1a00 100644 --- a/group_vars/osds.yml.sample +++ b/group_vars/osds.yml.sample @@ -179,9 +179,8 @@ 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_devices: -# - /dev/sdb +#ceph_osd_docker_extra_env: "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 05d5fd851..bf98e26bc 100644 --- a/group_vars/rgws.yml.sample +++ b/group_vars/rgws.yml.sample @@ -38,11 +38,12 @@ dummy: #rgw_containerized_deployment_with_kv: false #kv_type: etcd #kv_endpoint: 127.0.0.1 -#ceph_rgw_civetweb_port: 80 +#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_docker_on_openstack: false #ceph_config_keys: [] # DON'T TOUCH ME +#rgw_config_keys: "/" # DON'T TOUCH ME diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml index 77ae55cec..dc7d2a5bf 100644 --- a/roles/ceph-mon/defaults/main.yml +++ b/roles/ceph-mon/defaults/main.yml @@ -72,12 +72,12 @@ mon_containerized_deployment: false mon_containerized_deployment_with_kv: false # This is currently in ceph-common defaults because it is shared with ceph-nfs #mon_containerized_default_ceph_conf_with_kv: false -ceph_mon_docker_interface: eth0 -#ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface +ceph_mon_docker_interface: "{{ monitor_interface }}" +ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface ceph_mon_docker_username: ceph ceph_mon_docker_imagename: daemon ceph_mon_docker_image_tag: latest -ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables +ceph_mon_extra_envs: "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 4a1710c25..1fec4633f 100644 --- a/roles/ceph-osd/defaults/main.yml +++ b/roles/ceph-osd/defaults/main.yml @@ -171,8 +171,7 @@ ceph_osd_docker_prepare_env: "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" # comma separated variables -#ceph_osd_docker_devices: -# - /dev/sdb +ceph_osd_docker_extra_env: "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-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml index ac0cd140c..78be7a6fd 100644 --- a/roles/ceph-rgw/defaults/main.yml +++ b/roles/ceph-rgw/defaults/main.yml @@ -30,7 +30,7 @@ rgw_containerized_deployment: false rgw_containerized_deployment_with_kv: false kv_type: etcd kv_endpoint: 127.0.0.1 -ceph_rgw_civetweb_port: 80 +ceph_rgw_civetweb_port: "{{ radosgw_civetweb_port }}" ceph_rgw_docker_username: ceph ceph_rgw_docker_imagename: daemon ceph_rgw_docker_image_tag: latest