ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1252 from font/docker_extra_env_vars 

Docker extra env vars
pull/1256/head
Sébastien Han 2017-01-27 14:19:00 +01:00 committed by GitHub
parent 625ee0952e 0298354137
commit 6a3d0e3711
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Vagrantfile vendored
View File

@ -81,7 +81,6 @@ ansible_provision = proc do |ansible|
rbd_mirror_containerized_deployment: 'true', rbd_mirror_containerized_deployment: 'true',
ceph_mon_docker_interface: ETH, ceph_mon_docker_interface: ETH,
ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24", ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24",
ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE,OSD_JOURNAL_SIZE=100",
ceph_osd_docker_devices: settings['disks'], ceph_osd_docker_devices: settings['disks'],
devices: settings['disks'], devices: settings['disks'],
ceph_docker_on_openstack: BOX == 'openstack', ceph_docker_on_openstack: BOX == 'openstack',

10
group_vars/all.docker.yml.sample
View File

@ -23,7 +23,7 @@ dummy:
#ceph_mon_docker_image_tag: latest #ceph_mon_docker_image_tag: latest
#ceph_mon_docker_interface: "{{ monitor_interface }}" #ceph_mon_docker_interface: "{{ monitor_interface }}"
#ceph_mon_docker_subnet: "{{ public_network }}" # subnet of the ceph_mon_docker_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 # # OSD #
@ -35,7 +35,7 @@ dummy:
#ceph_osd_docker_username: ceph #ceph_osd_docker_username: ceph
#ceph_osd_docker_imagename: daemon #ceph_osd_docker_imagename: daemon
#ceph_osd_docker_image_tag: latest #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_prepare_env: "OSD_FORCE_ZAP=1" # comma separated variables
#ceph_osd_docker_devices: #ceph_osd_docker_devices:
# - /dev/sdb # - /dev/sdb
@ -54,7 +54,7 @@ dummy:
#ceph_mds_docker_username: ceph #ceph_mds_docker_username: ceph
#ceph_mds_docker_imagename: daemon #ceph_mds_docker_imagename: daemon
#ceph_mds_docker_image_tag: latest #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 # # RGW #
@ -67,7 +67,7 @@ dummy:
#ceph_rgw_docker_imagename: daemon #ceph_rgw_docker_imagename: daemon
#ceph_rgw_docker_image_tag: latest #ceph_rgw_docker_image_tag: latest
#ceph_rgw_civetweb_port: 80 #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 # # RESTAPI #
@ -101,7 +101,7 @@ dummy:
#ceph_nfs_docker_username: ceph #ceph_nfs_docker_username: ceph
#ceph_nfs_docker_imagename: daemon #ceph_nfs_docker_imagename: daemon
#ceph_nfs_docker_image_tag: latest #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_file_gw: false
#nfs_obj_gw: false #nfs_obj_gw: false
#ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY" #ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY"

4
infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
View File

@ -167,7 +167,7 @@
net: "host" net: "host"
state: "running" state: "running"
privileged: "{{ mon_docker_privileged }}" privileged: "{{ mon_docker_privileged }}"
env: "MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},CEPH_FSID={{ ceph_fsid.stdout }},{{ ceph_mon_extra_envs }}" env: "MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},CEPH_FSID={{ ceph_fsid.stdout }},{{ ceph_mon_docker_extra_env }}"
volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/etc/localtime:/etc/localtime:ro" volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/etc/localtime:/etc/localtime:ro"
- name: waiting for the monitor to join the quorum... - name: waiting for the monitor to join the quorum...
@ -524,5 +524,5 @@
state: "running" state: "running"
privileged: true privileged: true
ports: "{{ ceph_nfs_port }}:{{ ceph_nfs_port }},111:111" ports: "{{ ceph_nfs_port }}:{{ ceph_nfs_port }},111:111"
env: "CEPH_DAEMON=NFS,CEPH_PUBLIC_NETWORK={{ ceph_nfs_docker_subnet }},{{ ceph_nfs_extra_envs }}" env: "CEPH_DAEMON=NFS,CEPH_PUBLIC_NETWORK={{ ceph_nfs_docker_subnet }},{{ ceph_nfs_docker_extra_env }}"
volumes: "/etc/ceph:/etc/ceph,/etc/ganesha:/etc/ganesha,/etc/localtime:/etc/localtime:ro" volumes: "/etc/ceph:/etc/ceph,/etc/ganesha:/etc/ganesha,/etc/localtime:/etc/localtime:ro"