-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
allow adding a monitor to a deployed cluster
Add a playbook that deploys a new monitor on a new node, adds that node to the Ceph cluster and the monitor to the quorum and updates the ceph configuration file on OSD nodes. Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit d5967af)
- Loading branch information
1 parent
ddabcf9
commit dab0bb6
Showing
14 changed files
with
303 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
--- | ||
# This playbook is used to add a new MON to | ||
# an existing cluster. It can run from any machine. Even if the fetch | ||
# directory is not present it will be created. | ||
# | ||
# Ensure that all monitors are present in the mons | ||
# group in your inventory so that the ceph configuration file | ||
# is created correctly for the new OSD(s). | ||
- hosts: mons | ||
gather_facts: false | ||
vars: | ||
delegate_facts_host: true | ||
pre_tasks: | ||
- name: gather facts | ||
setup: | ||
when: not delegate_facts_host | bool | ||
- import_role: | ||
name: ceph-defaults | ||
- name: gather and delegate facts | ||
setup: | ||
delegate_to: "{{ item }}" | ||
delegate_facts: true | ||
with_items: "{{ groups[mon_group_name] }}" | ||
run_once: true | ||
when: delegate_facts_host | bool | ||
tasks: | ||
- import_role: | ||
name: ceph-facts | ||
- import_role: | ||
name: ceph-validate | ||
|
||
- hosts: mons | ||
gather_facts: false | ||
become: true | ||
tasks: | ||
- import_role: | ||
name: ceph-defaults | ||
- import_role: | ||
name: ceph-facts | ||
- import_role: | ||
name: ceph-handler | ||
- import_role: | ||
name: ceph-common | ||
when: not containerized_deployment | bool | ||
- import_role: | ||
name: ceph-container-common | ||
when: containerized_deployment | bool | ||
- import_role: | ||
name: ceph-config | ||
- import_role: | ||
name: ceph-infra | ||
- import_role: | ||
name: ceph-mon | ||
|
||
# update config files on OSD nodes | ||
- hosts: osds | ||
gather_facts: true | ||
become: true | ||
tasks: | ||
- import_role: | ||
name: ceph-defaults | ||
- import_role: | ||
name: ceph-facts | ||
- import_role: | ||
name: ceph-handler | ||
- import_role: | ||
name: ceph-config |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../Vagrantfile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../all_daemons/ceph-override.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../../Vagrantfile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../all_daemons/ceph-override.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
--- | ||
docker: True | ||
ceph_origin: repository | ||
ceph_repository: community | ||
containerized_deployment: true | ||
cluster: ceph | ||
public_network: "192.168.55.0/24" | ||
cluster_network: "192.168.56.0/24" | ||
monitor_interface: eth1 | ||
radosgw_interface: eth1 | ||
journal_size: 100 | ||
osd_objectstore: "bluestore" | ||
osd_scenario: lvm | ||
copy_admin_key: true | ||
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb | ||
lvm_volumes: | ||
- data: data-lv1 | ||
data_vg: test_group | ||
- data: data-lv2 | ||
data_vg: test_group | ||
db: journal1 | ||
db_vg: journals | ||
os_tuning_params: | ||
- { name: fs.file-max, value: 26234859 } | ||
ceph_conf_overrides: | ||
global: | ||
osd_pool_default_size: 1 | ||
ceph_osd_docker_run_script_path: /var/tmp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
[mons] | ||
mon0 | ||
|
||
[osds] | ||
osd0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
[mons] | ||
mon0 | ||
mon1 | ||
|
||
[osds] | ||
osd0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
--- | ||
|
||
# DEPLOY CONTAINERIZED DAEMONS | ||
docker: false | ||
|
||
# DEFINE THE NUMBER OF VMS TO RUN | ||
mon_vms: 2 | ||
osd_vms: 1 | ||
mds_vms: 0 | ||
rgw_vms: 0 | ||
nfs_vms: 0 | ||
rbd_mirror_vms: 0 | ||
client_vms: 0 | ||
iscsi_gw_vms: 0 | ||
mgr_vms: 0 | ||
|
||
# INSTALL SOURCE OF CEPH | ||
# valid values are 'stable' and 'dev' | ||
ceph_install_source: stable | ||
|
||
# SUBNETS TO USE FOR THE VMS | ||
public_subnet: 192.168.55 | ||
cluster_subnet: 192.168.56 | ||
|
||
# MEMORY | ||
# set 1024 for CentOS | ||
memory: 1024 | ||
|
||
# Ethernet interface name | ||
# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial | ||
eth: 'eth1' | ||
|
||
# Disks | ||
# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" | ||
# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" | ||
disks: "[ '/dev/sdb', '/dev/sdc' ]" | ||
|
||
# VAGRANT BOX | ||
# Ceph boxes are *strongly* suggested. They are under better control and will | ||
# not get updated frequently unless required for build systems. These are (for | ||
# now): | ||
# | ||
# * ceph/ubuntu-xenial | ||
# | ||
# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 | ||
# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet | ||
# libvirt CentOS: centos/7 | ||
# parallels Ubuntu: parallels/ubuntu-14.04 | ||
# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' | ||
# For more boxes have a look at: | ||
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= | ||
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ | ||
vagrant_box: centos/atomic-host | ||
#ssh_private_key_path: "~/.ssh/id_rsa" | ||
# The sync directory changes based on vagrant box | ||
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant | ||
#vagrant_sync_dir: /home/vagrant/sync | ||
vagrant_sync_dir: /vagrant | ||
# Disables synced folder creation. Not needed for testing, will skip mounting | ||
# the vagrant directory on the remote box regardless of the provider. | ||
vagrant_disable_synced_folder: true | ||
# VAGRANT URL | ||
# This is a URL to download an image from an alternate location. vagrant_box | ||
# above should be set to the filename of the image. | ||
# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box | ||
# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box | ||
# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box | ||
|
||
os_tuning_params: | ||
- { name: fs.file-max, value: 26234859 } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
--- | ||
ceph_origin: repository | ||
ceph_repository: dev | ||
cluster: ceph | ||
public_network: "192.168.53.0/24" | ||
cluster_network: "192.168.54.0/24" | ||
monitor_interface: eth1 | ||
radosgw_interface: eth1 | ||
journal_size: 100 | ||
osd_objectstore: "bluestore" | ||
osd_scenario: lvm | ||
copy_admin_key: true | ||
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb | ||
lvm_volumes: | ||
- data: data-lv1 | ||
data_vg: test_group | ||
- data: data-lv2 | ||
data_vg: test_group | ||
db: journal1 | ||
db_vg: journals | ||
os_tuning_params: | ||
- { name: fs.file-max, value: 26234859 } | ||
ceph_conf_overrides: | ||
global: | ||
osd_pool_default_size: 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
[mons] | ||
mon0 | ||
|
||
[osds] | ||
osd0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
[mons] | ||
mon0 | ||
mon1 | ||
|
||
[osds] | ||
osd0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
--- | ||
|
||
# DEPLOY CONTAINERIZED DAEMONS | ||
docker: false | ||
|
||
# DEFINE THE NUMBER OF VMS TO RUN | ||
mon_vms: 2 | ||
osd_vms: 1 | ||
mds_vms: 0 | ||
rgw_vms: 0 | ||
nfs_vms: 0 | ||
rbd_mirror_vms: 0 | ||
client_vms: 0 | ||
iscsi_gw_vms: 0 | ||
mgr_vms: 0 | ||
|
||
# INSTALL SOURCE OF CEPH | ||
# valid values are 'stable' and 'dev' | ||
ceph_install_source: stable | ||
|
||
# SUBNETS TO USE FOR THE VMS | ||
public_subnet: 192.168.53 | ||
cluster_subnet: 192.168.54 | ||
|
||
# MEMORY | ||
# set 1024 for CentOS | ||
memory: 512 | ||
|
||
# Ethernet interface name | ||
# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial | ||
eth: 'eth1' | ||
|
||
# Disks | ||
# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" | ||
# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" | ||
disks: "[ '/dev/sdb', '/dev/sdc' ]" | ||
|
||
# VAGRANT BOX | ||
# Ceph boxes are *strongly* suggested. They are under better control and will | ||
# not get updated frequently unless required for build systems. These are (for | ||
# now): | ||
# | ||
# * ceph/ubuntu-xenial | ||
# | ||
# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 | ||
# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet | ||
# libvirt CentOS: centos/7 | ||
# parallels Ubuntu: parallels/ubuntu-14.04 | ||
# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' | ||
# For more boxes have a look at: | ||
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= | ||
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ | ||
vagrant_box: centos/atomic-host | ||
#ssh_private_key_path: "~/.ssh/id_rsa" | ||
# The sync directory changes based on vagrant box | ||
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant | ||
#vagrant_sync_dir: /home/vagrant/sync | ||
vagrant_sync_dir: /vagrant | ||
# Disables synced folder creation. Not needed for testing, will skip mounting | ||
# the vagrant directory on the remote box regardless of the provider. | ||
vagrant_disable_synced_folder: true | ||
# VAGRANT URL | ||
# This is a URL to download an image from an alternate location. vagrant_box | ||
# above should be set to the filename of the image. | ||
# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box | ||
# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box | ||
# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box | ||
|
||
os_tuning_params: | ||
- { name: fs.file-max, value: 26234859 } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters