From: Rishabh Dave Date: Sun, 7 Apr 2019 06:14:05 +0000 (-0400) Subject: allow adding a RBD mirror to already deployed cluster X-Git-Tag: v4.0.0rc6~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae9fa7ca0905d257de3a287706e34af9c9ccc4ca;p=ceph-ansible.git allow adding a RBD mirror to already deployed cluster Add a tox scenario that adds a new RBD mirror node as a part of already deployed Ceph cluster and deploys RBD mirror there. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1677431 Signed-off-by: Rishabh Dave (cherry picked from commit 221b2b4988a735a3ebe08f227b5fa85352022e05) Conflicts: tox.ini "dev" was to replaced by "nautilus" in "envlist" --- diff --git a/tests/functional/add-rbdmirrors/Vagrantfile b/tests/functional/add-rbdmirrors/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/add-rbdmirrors/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/add-rbdmirrors/ceph-override.json b/tests/functional/add-rbdmirrors/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/add-rbdmirrors/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/add-rbdmirrors/container/Vagrantfile b/tests/functional/add-rbdmirrors/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/add-rbdmirrors/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/add-rbdmirrors/container/ceph-override.json b/tests/functional/add-rbdmirrors/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/add-rbdmirrors/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all new file mode 100644 index 000000000..edaeef95a --- /dev/null +++ b/tests/functional/add-rbdmirrors/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.67.0/24" +cluster_network: "192.168.68.0/24" +monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" +radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" +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-rbdmirrors/container/hosts b/tests/functional/add-rbdmirrors/container/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/add-rbdmirrors/container/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/add-rbdmirrors/container/hosts-2 b/tests/functional/add-rbdmirrors/container/hosts-2 new file mode 100644 index 000000000..b87d73918 --- /dev/null +++ b/tests/functional/add-rbdmirrors/container/hosts-2 @@ -0,0 +1,8 @@ +[mons] +mon0 + +[osds] +osd0 + +[rbdmirrors] +rbd-mirror0 diff --git a/tests/functional/add-rbdmirrors/container/vagrant_variables.yml b/tests/functional/add-rbdmirrors/container/vagrant_variables.yml new file mode 100644 index 000000000..a305c0bfb --- /dev/null +++ b/tests/functional/add-rbdmirrors/container/vagrant_variables.yml @@ -0,0 +1,70 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: true + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 1 +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.67 +cluster_subnet: 192.168.68 + +# 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/7 +#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-rbdmirrors/group_vars/all b/tests/functional/add-rbdmirrors/group_vars/all new file mode 100644 index 000000000..29f71b595 --- /dev/null +++ b/tests/functional/add-rbdmirrors/group_vars/all @@ -0,0 +1,25 @@ +--- +ceph_origin: repository +ceph_repository: community +cluster: ceph +public_network: "192.168.65.0/24" +cluster_network: "192.168.66.0/24" +monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" +radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" +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-rbdmirrors/hosts b/tests/functional/add-rbdmirrors/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/add-rbdmirrors/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/add-rbdmirrors/hosts-2 b/tests/functional/add-rbdmirrors/hosts-2 new file mode 100644 index 000000000..b87d73918 --- /dev/null +++ b/tests/functional/add-rbdmirrors/hosts-2 @@ -0,0 +1,8 @@ +[mons] +mon0 + +[osds] +osd0 + +[rbdmirrors] +rbd-mirror0 diff --git a/tests/functional/add-rbdmirrors/hosts-ubuntu b/tests/functional/add-rbdmirrors/hosts-ubuntu new file mode 120000 index 000000000..9b0b900ab --- /dev/null +++ b/tests/functional/add-rbdmirrors/hosts-ubuntu @@ -0,0 +1 @@ +hosts \ No newline at end of file diff --git a/tests/functional/add-rbdmirrors/vagrant_variables.yml b/tests/functional/add-rbdmirrors/vagrant_variables.yml new file mode 100644 index 000000000..4575c8315 --- /dev/null +++ b/tests/functional/add-rbdmirrors/vagrant_variables.yml @@ -0,0 +1,70 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 1 +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.65 +cluster_subnet: 192.168.66 + +# 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/7 +#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 1977b3897..fa6552d77 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -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} +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,add_rbdmirrors,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 @@ -244,7 +244,22 @@ commands= ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ " - py.test -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 {toxinidir}/tests/functional/tests + py.test -n 8 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 {toxinidir}/tests/functional/tests + +[add-rbdmirrors] +commands= + ansible-playbook -vv -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/tests/functional/setup.yml + ansible-playbook -vv -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/{env:PLAYBOOK:site.yml.sample} --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-master} \ + ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ + ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + " + py.test -n 8 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 {toxinidir}/tests/functional/tests [rgw-multisite] commands= @@ -347,6 +362,7 @@ changedir= 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:} + add_rbdmirrors: {toxinidir}/tests/functional/add-rbdmirrors{env:CONTAINER_DIR:} rgw_multisite: {toxinidir}/tests/functional/rgw-multisite{env:CONTAINER_DIR:} podman: {toxinidir}/tests/functional/podman storage_inventory: {toxinidir}/tests/functional/lvm-osds{env:CONTAINER_DIR:} @@ -399,6 +415,7 @@ commands= add_osds: {[add-osds]commands} add_mons: {[add-mons]commands} add_mdss: {[add-mdss]commands} + add_rbdmirrors: {[add-rbdmirrors]commands} rgw_multisite: {[rgw-multisite]commands} storage_inventory: {[storage-inventory]commands}