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 #951 from ceph/fix-docker-cluster-name 

Fix docker cluster name
pull/956/head
Leseb 2016-08-24 09:44:40 +02:00 committed by GitHub
parent 96f7f8b74e 708c43a04e
commit e017386645
24 changed files with 75 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Vagrantfile vendored
View File

@ -75,13 +75,15 @@ 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: "#{SUBNET}.0/24", ceph_mon_docker_subnet: "#{SUBNET}.0/24",
ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK,OSD_JOURNAL_SIZE=100", ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE,OSD_JOURNAL_SIZE=100",
cluster_network: "#{SUBNET}.0/24", cluster_network: "#{SUBNET}.0/24",
public_network: "#{SUBNET}.0/24", public_network: "#{SUBNET}.0/24",
ceph_osd_docker_devices: settings['disks'], ceph_osd_docker_devices: settings['disks'],
# Note that OSVM is defaulted to false above # Note that OSVM is defaulted to false above
ceph_docker_on_openstack: OSVM, ceph_docker_on_openstack: OSVM,
ceph_rgw_civetweb_port: 8080 ceph_rgw_civetweb_port: 8080,
generate_fsid: 'true',
journal_size: 100,
} }
else else
ansible.extra_vars = { ansible.extra_vars = {

2
group_vars/osds.sample
View File

@ -145,7 +145,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" # comma separated variables #ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
#ceph_osd_docker_devices: #ceph_osd_docker_devices:
# - /dev/sdb # - /dev/sdb
#ceph_docker_on_openstack: false #ceph_docker_on_openstack: false

2
roles/ceph-common/templates/s3gw.fcgi.j2
View File

@ -1,3 +1,3 @@
# {{ ansible_managed }} # {{ ansible_managed }}
#!/bin/sh #!/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 }}

14
roles/ceph-mds/tasks/docker/checks.yml
View File

@ -2,13 +2,13 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/monmap - /etc/ceph/monmap-{{ cluster }}
- /etc/ceph/ceph.mon.keyring - /etc/ceph/{{ cluster }}.mon.keyring
- /var/lib/ceph/bootstrap-osd/ceph.keyring - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-rgw/ceph.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-mds/ceph.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
stat: stat:

6
roles/ceph-mds/tasks/docker/fetch_configs.yml
View File

@ -4,9 +4,9 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /var/lib/ceph/bootstrap-mds/ceph.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }} local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

14
roles/ceph-mon/tasks/docker/checks.yml
View File

@ -2,13 +2,13 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/monmap - /etc/ceph/monmap-{{ cluster }}
- /etc/ceph/ceph.mon.keyring - /etc/ceph/{{ cluster }}.mon.keyring
- /var/lib/ceph/bootstrap-osd/ceph.keyring - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-rgw/ceph.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-mds/ceph.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
stat: stat:

2
roles/ceph-mon/tasks/docker/create_configs.yml
View File

@ -25,7 +25,7 @@
action: config_template action: config_template
args: args:
src: "{{ playbook_dir }}/roles/ceph-common/templates/ceph.conf.j2" src: "{{ playbook_dir }}/roles/ceph-common/templates/ceph.conf.j2"
dest: /etc/ceph/ceph.conf dest: "/etc/ceph/{{ cluster }}.conf"
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0644" mode: "0644"

14
roles/ceph-mon/tasks/docker/fetch_configs.yml
View File

@ -2,13 +2,13 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /etc/ceph/monmap - /etc/ceph/monmap-{{ cluster }}
- /etc/ceph/ceph.mon.keyring - /etc/ceph/{{ cluster }}.mon.keyring
- /var/lib/ceph/bootstrap-osd/ceph.keyring - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-rgw/ceph.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-mds/ceph.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }} local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

1
roles/ceph-mon/tasks/docker/main.yml
View File

@ -48,7 +48,6 @@
# let the first mon create configs and keyrings # let the first mon create configs and keyrings
- include: create_configs.yml - include: create_configs.yml
when: when:
- inventory_hostname == groups.mons[0]
- not mon_containerized_default_ceph_conf_with_kv - not mon_containerized_default_ceph_conf_with_kv
- include: fetch_configs.yml - include: fetch_configs.yml

4
roles/ceph-mon/tasks/docker/start_docker_monitor.yml
View File

@ -26,7 +26,7 @@
KV_IP: "{{kv_endpoint}}" KV_IP: "{{kv_endpoint}}"
KV_PORT: "{{kv_port}}" KV_PORT: "{{kv_port}}"
volumes: volumes:
- /etc/ceph/ceph.conf:/etc/ceph/ceph.defaults - /etc/ceph/"{{ cluster }}".conf:/etc/ceph/ceph.defaults
run_once: true run_once: true
when: when:
- inventory_hostname == groups.mons[0] - inventory_hostname == groups.mons[0]
@ -74,7 +74,7 @@
- name: wait for ceph.conf exists - name: wait for ceph.conf exists
wait_for: wait_for:
path: /etc/ceph/ceph.conf path: "/etc/ceph/{{ cluster }}.conf"
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'
- name: run the ceph monitor docker image - name: run the ceph monitor docker image

8
roles/ceph-nfs/tasks/docker/checks.yml
View File

@ -2,10 +2,10 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/monmap - /etc/ceph/monmap-{{ cluster }}
- /etc/ceph/ceph.mon.keyring - /etc/ceph/{{ cluster }}.mon.keyring
- /etc/ganesha/ganesha.conf - /etc/ganesha/ganesha.conf
- name: stat for ceph config and keys - name: stat for ceph config and keys

4
roles/ceph-nfs/tasks/docker/copy_configs.yml
View File

@ -2,8 +2,8 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /var/lib/ceph/radosgw/keyring - /var/lib/ceph/radosgw/keyring
- name: stat for config and keys - name: stat for config and keys

2
roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
View File

@ -49,7 +49,7 @@
- name: wait for ceph.conf exists - name: wait for ceph.conf exists
wait_for: wait_for:
path: /etc/ceph/ceph.conf path: "/etc/ceph/{{ cluster }}.conf"
when: is_atomic when: is_atomic
- name: run the ceph NFS docker image - name: run the ceph NFS docker image

2
roles/ceph-osd/defaults/main.yml
View File

@ -137,7 +137,7 @@ ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1"
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" # comma separated variables ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
#ceph_osd_docker_devices: #ceph_osd_docker_devices:
# - /dev/sdb # - /dev/sdb
ceph_docker_on_openstack: false ceph_docker_on_openstack: false

14
roles/ceph-osd/tasks/docker/checks.yml
View File

@ -2,13 +2,13 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/monmap - /etc/ceph/monmap-{{ cluster }}
- /etc/ceph/ceph.mon.keyring - /etc/ceph/{{ cluster }}.mon.keyring
- /var/lib/ceph/bootstrap-osd/ceph.keyring - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-rgw/ceph.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-mds/ceph.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
stat: stat:

4
roles/ceph-osd/tasks/docker/fetch_configs.yml
View File

@ -2,8 +2,8 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /var/lib/ceph/bootstrap-osd/ceph.keyring - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
- name: wait for ceph.conf and keys - name: wait for ceph.conf and keys
local_action: > local_action: >

4
roles/ceph-osd/tasks/docker/start_docker_osd.yml
View File

@ -31,7 +31,7 @@
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
-e "OSD_DEVICE={{ item.0 }}" \ -e "OSD_DEVICE={{ item.0 }}" \
-e "{{ ceph_osd_docker_prepare_env }}" \ -e "{{ ceph_osd_docker_prepare_env }}" \
-e CEPH_DAEMON=osd_ceph_disk_prepare \ -e CEPH_DAEMON=OSD_CEPH_DISK_PREPARE \
"{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}" "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
with_together: with_together:
- ceph_osd_docker_devices - ceph_osd_docker_devices
@ -52,7 +52,7 @@
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
-e "OSD_DEVICE={{ item.0 }}" \ -e "OSD_DEVICE={{ item.0 }}" \
-e "{{ ceph_osd_docker_prepare_env }}" \ -e "{{ ceph_osd_docker_prepare_env }}" \
-e CEPH_DAEMON=osd_ceph_disk_prepare \ -e CEPH_DAEMON=OSD_CEPH_DISK_PREPARE \
-e KV_TYPE={{kv_type}} \ -e KV_TYPE={{kv_type}} \
-e KV_IP={{kv_endpoint}} \ -e KV_IP={{kv_endpoint}} \
-e KV_PORT={{kv_port}} \ -e KV_PORT={{kv_port}} \

14
roles/ceph-rbd-mirror/tasks/docker/checks.yml
View File

@ -2,13 +2,13 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/monmap - /etc/ceph/monmap-{{ cluster }}
- /etc/ceph/ceph.mon.keyring - /etc/ceph/{{ cluster }}.mon.keyring
- /var/lib/ceph/bootstrap-osd/ceph.keyring - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-rgw/ceph.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-mds/ceph.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
stat: stat:

4
roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml
View File

@ -4,8 +4,8 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }} local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

4
roles/ceph-restapi/tasks/docker/fetch_configs.yml
View File

@ -2,8 +2,8 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }} local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

14
roles/ceph-rgw/tasks/docker/checks.yml
View File

@ -2,13 +2,13 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /etc/ceph/monmap - /etc/ceph/monmap-{{ cluster }}
- /etc/ceph/ceph.mon.keyring - /etc/ceph/{{ cluster }}.mon.keyring
- /var/lib/ceph/bootstrap-osd/ceph.keyring - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-rgw/ceph.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-mds/ceph.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
stat: stat:

4
roles/ceph-rgw/tasks/docker/fetch_configs.yml
View File

@ -2,8 +2,8 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/ceph.conf - /etc/ceph/{{ cluster }}.conf
- /var/lib/ceph/bootstrap-rgw/ceph.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }} local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}

2
roles/ceph-rgw/tasks/multisite/destroy.yml
View File

@ -21,7 +21,7 @@
- name: delete zone from rgw stanza in ceph.conf - name: delete zone from rgw stanza in ceph.conf
lineinfile: lineinfile:
dest: /etc/ceph/ceph.conf dest: "/etc/ceph/{{ cluster }}.conf"
regexp: "rgw_zone = {{ rgw_zonegroup }}-{{ rgw_zone }}" regexp: "rgw_zone = {{ rgw_zonegroup }}-{{ rgw_zone }}"
state: absent state: absent
when: "rgw_zone is defined and rgw_zonegroup is defined" when: "rgw_zone is defined and rgw_zonegroup is defined"

2
roles/ceph-rgw/tasks/multisite/main.yml
View File

@ -18,7 +18,7 @@
# Continue with common tasks # Continue with common tasks
- name: add zone to rgw stanza in ceph.conf - name: add zone to rgw stanza in ceph.conf
lineinfile: lineinfile:
dest: /etc/ceph/ceph.conf dest: "/etc/ceph/{{ cluster }}.conf"
regexp: "{{ ansible_host }}" regexp: "{{ ansible_host }}"
insertafter: "^[client.rgw.{{ ansible_host }}]" insertafter: "^[client.rgw.{{ ansible_host }}]"
line: "rgw_zone = {{ rgw_zone }}" line: "rgw_zone = {{ rgw_zone }}"