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 d5967af7fb5ae96196bbea1e433301bb8d2cab71)

diff --git a/infrastructure-playbooks/add-mon.yml b/infrastructure-playbooks/add-mon.yml
new file mode 100644 (file)
index 0000000..bfd9199
--- /dev/null
+++ b/infrastructure-playbooks/add-mon.yml
@@ -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

diff --git a/tests/functional/add-mons/Vagrantfile b/tests/functional/add-mons/Vagrantfile
new file mode 120000 (symlink)
index 0000000..706a5bb
--- /dev/null
+++ b/tests/functional/add-mons/Vagrantfile
@@ -0,0 +1 @@
+../../../Vagrantfile
\ No newline at end of file

diff --git a/tests/functional/add-mons/ceph-override.json b/tests/functional/add-mons/ceph-override.json
new file mode 120000 (symlink)
index 0000000..fe2ff40
--- /dev/null
+++ b/tests/functional/add-mons/ceph-override.json
@@ -0,0 +1 @@
+../all_daemons/ceph-override.json
\ No newline at end of file

diff --git a/tests/functional/add-mons/container/Vagrantfile b/tests/functional/add-mons/container/Vagrantfile
new file mode 120000 (symlink)
index 0000000..16076e4
--- /dev/null
+++ b/tests/functional/add-mons/container/Vagrantfile
@@ -0,0 +1 @@
+../../../../Vagrantfile
\ No newline at end of file

diff --git a/tests/functional/add-mons/container/ceph-override.json b/tests/functional/add-mons/container/ceph-override.json
new file mode 120000 (symlink)
index 0000000..8417cc0
--- /dev/null
+++ b/tests/functional/add-mons/container/ceph-override.json
@@ -0,0 +1 @@
+../../all_daemons/ceph-override.json
\ No newline at end of file

diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all
new file mode 100644 (file)
index 0000000..84725f5
--- /dev/null
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -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

diff --git a/tests/functional/add-mons/container/hosts b/tests/functional/add-mons/container/hosts
new file mode 100644 (file)
index 0000000..f6a265a
--- /dev/null
+++ b/tests/functional/add-mons/container/hosts
@@ -0,0 +1,5 @@
+[mons]
+mon0
+
+[osds]
+osd0

diff --git a/tests/functional/add-mons/container/hosts-2 b/tests/functional/add-mons/container/hosts-2
new file mode 100644 (file)
index 0000000..6e9489f
--- /dev/null
+++ b/tests/functional/add-mons/container/hosts-2
@@ -0,0 +1,6 @@
+[mons]
+mon0
+mon1
+
+[osds]
+osd0

diff --git a/tests/functional/add-mons/container/vagrant_variables.yml b/tests/functional/add-mons/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..d0bdc6e
--- /dev/null
+++ b/tests/functional/add-mons/container/vagrant_variables.yml
@@ -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 }

diff --git a/tests/functional/add-mons/group_vars/all b/tests/functional/add-mons/group_vars/all
new file mode 100644 (file)
index 0000000..fa9a111
--- /dev/null
+++ b/tests/functional/add-mons/group_vars/all
@@ -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

diff --git a/tests/functional/add-mons/hosts b/tests/functional/add-mons/hosts
new file mode 100644 (file)
index 0000000..f6a265a
--- /dev/null
+++ b/tests/functional/add-mons/hosts
@@ -0,0 +1,5 @@
+[mons]
+mon0
+
+[osds]
+osd0

diff --git a/tests/functional/add-mons/hosts-2 b/tests/functional/add-mons/hosts-2
new file mode 100644 (file)
index 0000000..6e9489f
--- /dev/null
+++ b/tests/functional/add-mons/hosts-2
@@ -0,0 +1,6 @@
+[mons]
+mon0
+mon1
+
+[osds]
+osd0

diff --git a/tests/functional/add-mons/vagrant_variables.yml b/tests/functional/add-mons/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..e3726e3
--- /dev/null
+++ b/tests/functional/add-mons/vagrant_variables.yml
@@ -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 }

diff --git a/tox.ini b/tox.ini
index 72fbe19f76ff96deb4a6204b6084f4ebb894a879..60d6a3a1781e0cfb6ec48e438d748fdb126d45a6 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {nautilus,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,update,bluestore_lvm_osds,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,add_mdss,rgw_multisite,purge,storage_inventory,lvm_auto_discovery}
+envlist = {nautilus,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,bluestore_lvm_osds,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_mons,add_osds,add_mdss,rgw_multisite,purge,storage_inventory,lvm_auto_discovery}
   {nautilus,rhcs}-{centos,ubuntu}-container-{ooo_collocation,podman}
   {nautilus,rhcs}-{centos,ubuntu}-non_container-{switch_to_containers}
   nautilus-rhel-container-podman
@@ -143,6 +143,20 @@ commands=
 
   py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-switch-to-containers {toxinidir}/tests/functional/tests
 
+[add-mons]
+commands=
+  ansible-playbook -vv -i {changedir}/hosts-2 --limit mon1 {toxinidir}/tests/functional/setup.yml
+  cp {toxinidir}/infrastructure-playbooks/add-mon.yml {toxinidir}/add-mon.yml
+  ansible-playbook -vv -i {changedir}/hosts-2 {toxinidir}/add-mon.yml --extra-vars "\
+      ireallymeanit=yes \
+      fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \
+      "
+  py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 {toxinidir}/tests/functional/tests
+
 [add-osds]
 commands=
   ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/tests/functional/setup.yml
@@ -274,6 +288,7 @@ changedir=
   lvm_batch: {toxinidir}/tests/functional/lvm-batch{env:CONTAINER_DIR:}
   bluestore_lvm_osds: {toxinidir}/tests/functional/bs-lvm-osds{env:CONTAINER_DIR:}
   ooo_collocation: {toxinidir}/tests/functional/ooo-collocation
+  add_mons: {toxinidir}/tests/functional/add-mons{env:CONTAINER_DIR:}
   add_osds: {toxinidir}/tests/functional/add-osds{env:CONTAINER_DIR:}
   add_mdss: {toxinidir}/tests/functional/add-mdss{env:CONTAINER_DIR:}
   rgw_multisite: {toxinidir}/tests/functional/rgw-multisite{env:CONTAINER_DIR:}
@@ -327,6 +342,7 @@ commands=
   shrink_mon: {[shrink-mon]commands}
   shrink_osd: {[shrink-osd]commands}
   add_osds: {[add-osds]commands}
+  add_mons: {[add-mons]commands}
   add_mdss: {[add-mdss]commands}
   rgw_multisite: {[rgw-multisite]commands}
   storage_inventory: {[storage-inventory]commands}