mirror of https://github.com/ceph/ceph-ansible.git
Rebasing with upstream
James Saint-Rossy
commit
9d97ffed30
|
|
@ -243,7 +243,7 @@ Attention, ceph-common doesn't manage backports repository, you must add it your
|
|||
### For Atomic systems
|
||||
|
||||
If you want to run containerized deployment on Atomic systems (RHEL/CentOS Atomic), please copy
|
||||
[vagrant.yml.atomic](vagrant_variables.yml.atomic) to vagrant_variables.yml, and copy [group_vars/all.docker](group_vars/all.docker) to `group_vars/all`.
|
||||
[vagrant_variables.yml.atomic](vagrant_variables.yml.atomic) to vagrant_variables.yml, and copy [group_vars/all.docker](group_vars/all.docker) to `group_vars/all`.
|
||||
|
||||
Since `centos/atomic-host` VirtualBox box doesn't have spare storage controller to attach more disks, it is likely the first time `vagrant up --provider=virtualbox` runs, it will fail to attach to a storage controller. In such case, run the following command:
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ NNFSS = settings['nfs_vms']
|
|||
RESTAPI = settings['restapi']
|
||||
NRBD_MIRRORS = settings['rbd_mirror_vms']
|
||||
CLIENTS = settings['client_vms']
|
||||
NISCSI_GWS = settings['iscsi_gw_vms']
|
||||
SUBNET = settings['subnet']
|
||||
BOX = settings['vagrant_box']
|
||||
BOX_URL = settings['vagrant_box_url']
|
||||
|
|
@ -55,7 +56,8 @@ ansible_provision = proc do |ansible|
|
|||
'rgws' => (0..NRGWS - 1).map { |j| "#{OSPREFIX}rgw#{j}" },
|
||||
'nfss' => (0..NNFSS - 1).map { |j| "#{OSPREFIX}nfs#{j}" },
|
||||
'rbd_mirrors' => (0..NRBD_MIRRORS - 1).map { |j| "#{OSPREFIX}rbd_mirror#{j}" },
|
||||
'clients' => (0..CLIENTS - 1).map { |j| "#{OSPREFIX}client#{j}" }
|
||||
'clients' => (0..CLIENTS - 1).map { |j| "#{OSPREFIX}client#{j}" },
|
||||
'iscsi_gw' => (0..NISCSI_GWS - 1).map { |j| "#{OSPREFIX}iscsi_gw#{j}" }
|
||||
}
|
||||
|
||||
if RESTAPI then
|
||||
|
|
@ -75,13 +77,15 @@ ansible_provision = proc do |ansible|
|
|||
rbd_mirror_containerized_deployment: 'true',
|
||||
ceph_mon_docker_interface: ETH,
|
||||
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",
|
||||
public_network: "#{SUBNET}.0/24",
|
||||
ceph_osd_docker_devices: settings['disks'],
|
||||
# Note that OSVM is defaulted to false above
|
||||
ceph_docker_on_openstack: OSVM,
|
||||
ceph_rgw_civetweb_port: 8080
|
||||
ceph_rgw_civetweb_port: 8080,
|
||||
generate_fsid: 'true',
|
||||
journal_size: 100,
|
||||
}
|
||||
else
|
||||
ansible.extra_vars = {
|
||||
|
|
@ -281,6 +285,34 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||
end
|
||||
end
|
||||
|
||||
(0..NISCSI_GWS - 1).each do |i|
|
||||
config.vm.define "#{OSPREFIX}iscsi_gw#{i}" do |iscsi_gw|
|
||||
iscsi_gw.vm.hostname = "#{OSPREFIX}ceph-iscsi-gw#{i}"
|
||||
if !OSVM
|
||||
iscsi_gw.vm.network :private_network, ip: "#{SUBNET}.9#{i}"
|
||||
end
|
||||
# Virtualbox
|
||||
iscsi_gw.vm.provider :virtualbox do |vb|
|
||||
vb.customize ['modifyvm', :id, '--memory', "#{MEMORY}"]
|
||||
end
|
||||
|
||||
# VMware
|
||||
iscsi_gw.vm.provider :vmware_fusion do |v|
|
||||
v.vmx['memsize'] = "#{MEMORY}"
|
||||
end
|
||||
|
||||
# Libvirt
|
||||
iscsi_gw.vm.provider :libvirt do |lv|
|
||||
lv.memory = MEMORY
|
||||
end
|
||||
# Parallels
|
||||
iscsi_gw.vm.provider "parallels" do |prl|
|
||||
prl.name = "ceph-iscsi-gw#{i}"
|
||||
prl.memory = "#{MEMORY}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
(0..NMONS - 1).each do |i|
|
||||
config.vm.define "#{OSPREFIX}mon#{i}" do |mon|
|
||||
mon.vm.hostname = "#{OSPREFIX}ceph-mon#{i}"
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ dummy:
|
|||
#restapi_group_name: restapis
|
||||
#rbdmirror_group_name: rbdmirrors
|
||||
#client_group_name: clients
|
||||
#iscsi_group_name: iscsigws
|
||||
|
||||
# If check_firewall is true, then ansible will try to determine if the
|
||||
# Ceph ports are blocked by a firewall. If the machine running ansible
|
||||
|
|
@ -347,6 +348,7 @@ dummy:
|
|||
# by ceph.conf.j2 template. so it should always be defined
|
||||
#mon_containerized_deployment_with_kv: false
|
||||
#mon_containerized_deployment: false
|
||||
#mon_containerized_default_ceph_conf_with_kv: false
|
||||
|
||||
|
||||
##################
|
||||
|
|
@ -362,6 +364,7 @@ dummy:
|
|||
#bluestore: False
|
||||
#dmcrypt_journal_collocation: False
|
||||
#dmcrypt_dedicated_journal: False
|
||||
#raw_journal_devices: {}
|
||||
|
||||
#osd_auto_discovery: False
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
---
|
||||
# Variables here are applicable to all host groups NOT roles
|
||||
|
||||
# This sample file generated by generate_group_vars_sample.sh
|
||||
|
||||
# Dummy variable to avoid error because ansible does not recognize the
|
||||
# file as a good configuration file when no variable in it.
|
||||
dummy:
|
||||
|
||||
|
||||
|
|
@ -72,6 +72,7 @@ dummy:
|
|||
|
||||
#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
|
||||
|
|
|
|||
|
|
@ -145,7 +145,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" # comma separated variables
|
||||
#ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
|
||||
#ceph_osd_docker_devices:
|
||||
# - /dev/sdb
|
||||
#ceph_docker_on_openstack: false
|
||||
|
|
|
|||
|
|
@ -55,12 +55,12 @@
|
|||
become: true
|
||||
|
||||
tasks:
|
||||
- include_vars: roles/ceph-common/defaults/main.yml
|
||||
- include_vars: roles/ceph-mds/defaults/main.yml
|
||||
- include_vars: group_vars/all
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/mdss
|
||||
ignore_errors: true
|
||||
- include_vars: ../roles/ceph-common/defaults/main.yml
|
||||
- include_vars: ../roles/ceph-mds/defaults/main.yml
|
||||
- include_vars: ../group_vars/all
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/mdss
|
||||
failed_when: false
|
||||
|
||||
- name: disable ceph mds service
|
||||
service:
|
||||
|
|
@ -101,12 +101,12 @@
|
|||
become: true
|
||||
|
||||
tasks:
|
||||
- include_vars: roles/ceph-common/defaults/main.yml
|
||||
- include_vars: roles/ceph-rgw/defaults/main.yml
|
||||
- include_vars: group_vars/all
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/rgws
|
||||
ignore_errors: true
|
||||
- include_vars: ../roles/ceph-common/defaults/main.yml
|
||||
- include_vars: ../roles/ceph-rgw/defaults/main.yml
|
||||
- include_vars: ../group_vars/all
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/rgws
|
||||
failed_when: false
|
||||
|
||||
- name: disable ceph rgw service
|
||||
service:
|
||||
|
|
@ -147,12 +147,12 @@
|
|||
become: true
|
||||
|
||||
tasks:
|
||||
- include_vars: roles/ceph-common/defaults/main.yml
|
||||
- include_vars: roles/ceph-rbd-mirror/defaults/main.yml
|
||||
- include_vars: group_vars/all
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/rbd-mirrors
|
||||
ignore_errors: true
|
||||
- include_vars: ../roles/ceph-common/defaults/main.yml
|
||||
- include_vars: ../roles/ceph-rbd-mirror/defaults/main.yml
|
||||
- include_vars: ../group_vars/all
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/rbd-mirrors
|
||||
failed_when: false
|
||||
|
||||
- name: disable ceph rbd-mirror service
|
||||
service:
|
||||
|
|
@ -193,12 +193,12 @@
|
|||
become: true
|
||||
|
||||
tasks:
|
||||
- include_vars: roles/ceph-common/defaults/main.yml
|
||||
- include_vars: roles/ceph-nfs/defaults/main.yml
|
||||
- include_vars: group_vars/all
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/nfss
|
||||
ignore_errors: true
|
||||
- include_vars: ../roles/ceph-common/defaults/main.yml
|
||||
- include_vars: ../roles/ceph-nfs/defaults/main.yml
|
||||
- include_vars: ../group_vars/all
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/nfss
|
||||
failed_when: false
|
||||
|
||||
- name: disable ceph nfs service
|
||||
service:
|
||||
|
|
@ -248,12 +248,12 @@
|
|||
become: true
|
||||
|
||||
tasks:
|
||||
- include_vars: roles/ceph-common/defaults/main.yml
|
||||
- include_vars: roles/ceph-osd/defaults/main.yml
|
||||
- include_vars: group_vars/all
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/osds
|
||||
ignore_errors: true
|
||||
- include_vars: ../roles/ceph-common/defaults/main.yml
|
||||
- include_vars: ../roles/ceph-osd/defaults/main.yml
|
||||
- include_vars: ../group_vars/all
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/osds
|
||||
failed_when: false
|
||||
|
||||
- name: disable ceph osd service
|
||||
service:
|
||||
|
|
@ -343,15 +343,15 @@
|
|||
become: true
|
||||
|
||||
tasks:
|
||||
- include_vars: roles/ceph-common/defaults/main.yml
|
||||
- include_vars: roles/ceph-mon/defaults/main.yml
|
||||
- include_vars: roles/ceph-restapi/defaults/main.yml
|
||||
- include_vars: group_vars/all
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/mons
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/restapis
|
||||
ignore_errors: true
|
||||
- include_vars: ../roles/ceph-common/defaults/main.yml
|
||||
- include_vars: ../roles/ceph-mon/defaults/main.yml
|
||||
- include_vars: ../roles/ceph-restapi/defaults/main.yml
|
||||
- include_vars: ../group_vars/all
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/mons
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/restapis
|
||||
failed_when: false
|
||||
|
||||
- name: disable ceph mon service
|
||||
service:
|
||||
|
|
@ -599,23 +599,23 @@
|
|||
gather_facts: false
|
||||
|
||||
tasks:
|
||||
- include_vars: roles/ceph-common/defaults/main.yml
|
||||
- include_vars: group_vars/all
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/mdss
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/rgws
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/rbd-mirrors
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/nfss
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/osds
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/mons
|
||||
ignore_errors: true
|
||||
- include_vars: group_vars/restapis
|
||||
ignore_errors: true
|
||||
- include_vars: ../roles/ceph-common/defaults/main.yml
|
||||
- include_vars: ../group_vars/all
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/mdss
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/rgws
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/rbd-mirrors
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/nfss
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/osds
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/mons
|
||||
failed_when: false
|
||||
- include_vars: ../group_vars/restapis
|
||||
failed_when: false
|
||||
|
||||
- name: purge fetch directory for localhost
|
||||
file:
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ nfs_group_name: nfss
|
|||
restapi_group_name: restapis
|
||||
rbdmirror_group_name: rbdmirrors
|
||||
client_group_name: clients
|
||||
iscsi_group_name: iscsigws
|
||||
|
||||
# If check_firewall is true, then ansible will try to determine if the
|
||||
# Ceph ports are blocked by a firewall. If the machine running ansible
|
||||
|
|
@ -348,6 +349,7 @@ docker: false
|
|||
# by ceph.conf.j2 template. so it should always be defined
|
||||
mon_containerized_deployment_with_kv: false
|
||||
mon_containerized_deployment: false
|
||||
mon_containerized_default_ceph_conf_with_kv: false
|
||||
|
||||
|
||||
##################
|
||||
|
|
@ -363,6 +365,7 @@ osd_directory: False
|
|||
bluestore: False
|
||||
dmcrypt_journal_collocation: False
|
||||
dmcrypt_dedicated_journal: False
|
||||
raw_journal_devices: {}
|
||||
|
||||
osd_auto_discovery: False
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
# {{ ansible_managed }}
|
||||
#!/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 }}
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
---
|
||||
|
|
@ -0,0 +1 @@
|
|||
---
|
||||
|
|
@ -0,0 +1 @@
|
|||
---
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/monmap
|
||||
- /etc/ceph/ceph.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/ceph.keyring
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/monmap-{{ cluster }}
|
||||
- /etc/ceph/{{ cluster }}.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
stat:
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/ceph.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}
|
||||
|
|
|
|||
|
|
@ -64,7 +64,8 @@ openstack_keys:
|
|||
|
||||
mon_containerized_deployment: false
|
||||
mon_containerized_deployment_with_kv: false
|
||||
mon_containerized_default_ceph_conf_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_username: ceph
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/monmap
|
||||
- /etc/ceph/ceph.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/ceph.keyring
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/monmap-{{ cluster }}
|
||||
- /etc/ceph/{{ cluster }}.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
stat:
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
action: config_template
|
||||
args:
|
||||
src: "{{ playbook_dir }}/roles/ceph-common/templates/ceph.conf.j2"
|
||||
dest: /etc/ceph/ceph.conf
|
||||
dest: "/etc/ceph/{{ cluster }}.conf"
|
||||
owner: "root"
|
||||
group: "root"
|
||||
mode: "0644"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/monmap
|
||||
- /etc/ceph/ceph.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/ceph.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /etc/ceph/monmap-{{ cluster }}
|
||||
- /etc/ceph/{{ cluster }}.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
# let the first mon create configs and keyrings
|
||||
- include: create_configs.yml
|
||||
when:
|
||||
- inventory_hostname == groups.mons[0]
|
||||
- not mon_containerized_default_ceph_conf_with_kv
|
||||
|
||||
- include: fetch_configs.yml
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
KV_IP: "{{kv_endpoint}}"
|
||||
KV_PORT: "{{kv_port}}"
|
||||
volumes:
|
||||
- /etc/ceph/ceph.conf:/etc/ceph/ceph.defaults
|
||||
- /etc/ceph/"{{ cluster }}".conf:/etc/ceph/ceph.defaults
|
||||
run_once: true
|
||||
when:
|
||||
- inventory_hostname == groups.mons[0]
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
|
||||
- name: wait for ceph.conf exists
|
||||
wait_for:
|
||||
path: /etc/ceph/ceph.conf
|
||||
path: "/etc/ceph/{{ cluster }}.conf"
|
||||
when: ansible_os_family == 'RedHat'
|
||||
|
||||
- name: run the ceph monitor docker image
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/monmap
|
||||
- /etc/ceph/ceph.mon.keyring
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/monmap-{{ cluster }}
|
||||
- /etc/ceph/{{ cluster }}.mon.keyring
|
||||
- /etc/ganesha/ganesha.conf
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /var/lib/ceph/radosgw/keyring
|
||||
|
||||
- name: stat for config and keys
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
docker:
|
||||
image: "{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}"
|
||||
name: ceph-{{ ansible_hostname }}-rgw-user
|
||||
hostname: "{{ ansible_hostname }}"
|
||||
expose: "{{ ceph_rgw_civetweb_port }}"
|
||||
ports: "{{ ceph_rgw_civetweb_port }}:{{ ceph_rgw_civetweb_port }}"
|
||||
state: running
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
- include: create_configs.yml
|
||||
when:
|
||||
inventory_hostname == groups.nfss[0] and
|
||||
mon_containerized_default_ceph_conf_with_kv
|
||||
not mon_containerized_default_ceph_conf_with_kv
|
||||
|
||||
# Copy Ganesha configs to host
|
||||
- include: fetch_configs.yml
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
|
||||
- name: wait for ceph.conf exists
|
||||
wait_for:
|
||||
path: /etc/ceph/ceph.conf
|
||||
path: "/etc/ceph/{{ cluster }}.conf"
|
||||
when: is_atomic
|
||||
|
||||
- name: run the ceph NFS docker image
|
||||
|
|
|
|||
|
|
@ -137,7 +137,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" # comma separated variables
|
||||
ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
|
||||
#ceph_osd_docker_devices:
|
||||
# - /dev/sdb
|
||||
ceph_docker_on_openstack: false
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/monmap
|
||||
- /etc/ceph/ceph.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/ceph.keyring
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/monmap-{{ cluster }}
|
||||
- /etc/ceph/{{ cluster }}.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
stat:
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.conf
|
||||
- /var/lib/ceph/bootstrap-osd/ceph.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
|
||||
|
||||
- name: wait for ceph.conf and keys
|
||||
local_action: >
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
-v /etc/localtime:/etc/localtime:ro \
|
||||
-e "OSD_DEVICE={{ item.0 }}" \
|
||||
-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 }}"
|
||||
with_together:
|
||||
- ceph_osd_docker_devices
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
-v /etc/localtime:/etc/localtime:ro \
|
||||
-e "OSD_DEVICE={{ item.0 }}" \
|
||||
-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_IP={{kv_endpoint}} \
|
||||
-e KV_PORT={{kv_port}} \
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/monmap
|
||||
- /etc/ceph/ceph.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/ceph.keyring
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/monmap-{{ cluster }}
|
||||
- /etc/ceph/{{ cluster }}.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
stat:
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.client.admin.keyring
|
||||
- /etc/ceph/ceph.conf
|
||||
- /etc/ceph/monmap
|
||||
- /etc/ceph/ceph.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/ceph.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/ceph.keyring
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /etc/ceph/monmap-{{ cluster }}
|
||||
- /etc/ceph/{{ cluster }}.mon.keyring
|
||||
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
stat:
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@
|
|||
- rgw_config_keys
|
||||
- statconfig.results
|
||||
when:
|
||||
- item.1.stat.exists == false
|
||||
- nfs_obj_gw
|
||||
- item.1.stat.exists == false
|
||||
- inventory_hostname == groups.rgws[0]
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/ceph.conf
|
||||
- /var/lib/ceph/bootstrap-rgw/ceph.keyring
|
||||
- /etc/ceph/{{ cluster }}.conf
|
||||
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
|
||||
|
||||
- name: stat for ceph config and keys
|
||||
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
run_once: true
|
||||
failed_when: false
|
||||
|
||||
- name: delete the zonegroup
|
||||
- name: delete the zonegroup
|
||||
command: radosgw-admin zonegroup delete --rgw-zonegroup={{ rgw_zonegroup }}
|
||||
run_once: true
|
||||
failed_when: false
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
- name: delete zone from rgw stanza in ceph.conf
|
||||
lineinfile:
|
||||
dest: /etc/ceph/ceph.conf
|
||||
dest: "/etc/ceph/{{ cluster }}.conf"
|
||||
regexp: "rgw_zone = {{ rgw_zonegroup }}-{{ rgw_zone }}"
|
||||
state: absent
|
||||
when: "rgw_zone is defined and rgw_zonegroup is defined"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
# Continue with common tasks
|
||||
- name: add zone to rgw stanza in ceph.conf
|
||||
lineinfile:
|
||||
dest: /etc/ceph/ceph.conf
|
||||
dest: "/etc/ceph/{{ cluster }}.conf"
|
||||
regexp: "{{ ansible_host }}"
|
||||
insertafter: "^[client.rgw.{{ ansible_host }}]"
|
||||
line: "rgw_zone = {{ rgw_zone }}"
|
||||
|
|
|
|||
|
|
@ -45,3 +45,8 @@
|
|||
become: True
|
||||
roles:
|
||||
- ceph-client
|
||||
|
||||
- hosts: iscsigws
|
||||
become: True
|
||||
roles:
|
||||
- ceph-iscsi-gw
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ eth: 'eth0'
|
|||
# For Openstack VMs, choose the following box instead
|
||||
vagrant_box: 'openstack'
|
||||
|
||||
# For Atomic (RHEL or Cento) uncomment the line below
|
||||
# When using Atomic Hosts (RHEL or CentOS), uncomment the line below to skip package installation
|
||||
#skip_tags: 'with_pkg'
|
||||
|
||||
# For deploying on OpenStack VMs uncomment these vars and assign values.
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ rgw_vms: 0
|
|||
nfs_vms: 0
|
||||
rbd_mirror_vms: 0
|
||||
client_vms: 0
|
||||
iscsi_gw_vms: 0
|
||||
|
||||
# Deploy RESTAPI on each of the Monitors
|
||||
restapi: true
|
||||
|
|
|
|||
Loading…
Reference in New Issue