Merge pull request #1141 from ceph/more-mons

centos7_cluster and xenial_cluster scenarios should use 3 mons

tests/functional/centos/7/cluster/hosts

@@ -0,0 +1,13 @@
+[mons]
+mon0 monitor_address=192.168.1.10
+mon1 monitor_interface=eth1
+mon2 monitor_address=192.168.1.12
+
+[osds]
+osd0
+
+[mdss]
+mds0
+
+[rgws]
+rgw0

tests/functional/centos/7/cluster/scenario.py

@@ -1,7 +1,8 @@
 # Basic information about ceph and its configuration
 ceph = {
     'releases': ['infernalis', 'jewel'],
-    'cluster_name': 'ceph'
+    'cluster_name': 'ceph',
+    'subnet': '192.168.1',
 }
 
 # remote nodes to test, with anything specific to them that might be useful for
@@ -10,7 +11,15 @@ ceph = {
 nodes = {
     'mon0': {
         'username': 'vagrant',
-        'components': ['mon', 'mon_initial_members']
+        'components': ['conf_tests']
+    },
+    'mon1': {
+        'username': 'vagrant',
+        'components': ['conf_tests']
+    },
+    'mon2': {
+        'username': 'vagrant',
+        'components': ['conf_tests']
     },
     'osd0': {
         'username': 'vagrant',

tests/functional/centos/7/cluster/vagrant_variables.yml

@@ -4,7 +4,7 @@
 docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 1
+mon_vms: 3
 osd_vms: 1
 mds_vms: 1
 rgw_vms: 1

tests/functional/centos/7/mon-osd-mds-rgw/hosts

@@ -1,11 +0,0 @@
-[mons]
-mon0 monitor_interface=eth1
-
-[osds]
-osd0
-
-[mdss]
-mds0
-
-[rgws]
-rgw0

tests/functional/ubuntu/16.04/cluster/hosts

@@ -0,0 +1,13 @@
+[mons]
+mon0 monitor_address=192.168.5.10
+mon1 monitor_address=192.168.5.11
+mon2 monitor_interface=eth1
+
+[osds]
+osd0
+
+[mdss]
+mds0
+
+[rgws]
+rgw0

tests/functional/ubuntu/16.04/cluster/scenario.py

@@ -1,7 +1,8 @@
 # Basic information about ceph and its configuration
 ceph = {
     'releases': ['infernalis', 'jewel'],
-    'cluster_name': 'ceph'
+    'cluster_name': 'ceph',
+    'subnet': '192.168.5',
 }
 
 # remote nodes to test, with anything specific to them that might be useful for
@@ -10,7 +11,15 @@ ceph = {
 nodes = {
     'mon0': {
         'username': 'vagrant',
-        'components': ['mon', 'mon_initial_members']
+        'components': ['conf_tests']
+    },
+    'mon1': {
+        'username': 'vagrant',
+        'components': ['conf_tests']
+    },
+    'mon2': {
+        'username': 'vagrant',
+        'components': ['conf_tests']
     },
     'osd0': {
         'username': 'vagrant',

tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml

@@ -4,7 +4,7 @@
 docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 1
+mon_vms: 3
 osd_vms: 1
 mds_vms: 1
 rgw_vms: 1

tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts

@@ -1,11 +0,0 @@
-[mons]
-mon0 monitor_interface=eth1
-
-[osds]
-osd0
-
-[mdss]
-mds0
-
-[rgws]
-rgw0

tests/functional/ubuntu/16.04/mon-osd/Vagrantfile

@@ -1 +0,0 @@
-../../../../../Vagrantfile

tests/functional/ubuntu/16.04/mon-osd/group_vars/all

@@ -1,14 +0,0 @@
----
-
-ceph_stable: True
-public_network: "192.168.7.0/24"
-cluster_network: "192.168.8.0/24"
-journal_size: 100
-devices:
-  - '/dev/sdb'
-raw_journal_devices:
-  - '/dev/sdc'
-raw_multi_journal: True
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }

tests/functional/ubuntu/16.04/mon-osd/group_vars/osds

@@ -1,4 +0,0 @@
----
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }

tests/functional/ubuntu/16.04/mon-osd/hosts

@@ -1,5 +0,0 @@
-[mons]
-mon0 monitor_interface=eth1
-
-[osds]
-osd0

tests/functional/ubuntu/16.04/mon-osd/scenario.py

@@ -1,19 +0,0 @@
-# Basic information about ceph and its configuration
-ceph = {
-    'releases': ['infernalis', 'jewel'],
-    'cluster_name': 'ceph'
-}
-
-# remote nodes to test, with anything specific to them that might be useful for
-# tests to get. Each one of these can get requested as a py.test fixture to
-# validate information.
-nodes = {
-    'mon0': {
-        'username': 'vagrant',
-        'components': ['mon', 'mon_initial_members']
-    },
-    'osd0': {
-        'username': 'vagrant',
-        'components': ['mon', 'mon_initial_members']
-    }
-}

tests/functional/ubuntu/16.04/mon-osd/vagrant_variables.yml

@@ -1,73 +0,0 @@
----
-
-# 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: 0
-client_vms: 0
-iscsi_gw_vms: 0
-
-# Deploy RESTAPI on each of the Monitors
-restapi: true
-
-# INSTALL SOURCE OF CEPH
-# valid values are 'stable' and 'dev'
-ceph_install_source: stable
-
-# SUBNETS TO USE FOR THE VMS
-public_subnet: 192.168.7
-cluster_subnet: 192.168.8
-
-# 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: ceph/ubuntu-xenial
-#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: /
-# 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: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }

tests/functional/ubuntu/16.04/mon/Vagrantfile

@@ -1 +0,0 @@
-../../../../../Vagrantfile

tests/functional/ubuntu/16.04/mon/group_vars/all

@@ -1,13 +0,0 @@
----
-
-ceph_stable: True
-public_network: "192.168.9.0/24"
-cluster_network: "192.168.10.0/24"
-journal_size: 100
-devices:
-  - '/dev/sdb'
-  - '/dev/sdc'
-journal_collocation: True
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }

tests/functional/ubuntu/16.04/mon/group_vars/osds

@@ -1,4 +0,0 @@
----
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }

tests/functional/ubuntu/16.04/mon/hosts

@@ -1,4 +0,0 @@
-[mons]
-mon0 monitor_address=192.168.9.10
-mon1 monitor_address=192.168.9.11
-mon2 monitor_interface=eth1

tests/functional/ubuntu/16.04/mon/scenario.py

@@ -1,23 +0,0 @@
-# Basic information about ceph and its configuration
-ceph = {
-    'releases': ['infernalis', 'jewel'],
-    'cluster_name': 'ceph'
-}
-
-# remote nodes to test, with anything specific to them that might be useful for
-# tests to get. Each one of these can get requested as a py.test fixture to
-# validate information.
-nodes = {
-    'mon0': {
-        'username': 'vagrant',
-        'components': ['conf_tests']
-    },
-    'mon1': {
-        'username': 'vagrant',
-        'components': ['conf_tests']
-    },
-    'mon2': {
-        'username': 'vagrant',
-        'components': ['conf_tests']
-    },
-}

tests/functional/ubuntu/16.04/mon/vagrant_variables.yml

@@ -1,73 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: false
-
-# DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 3
-osd_vms: 0
-mds_vms: 0
-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
-
-# INSTALL SOURCE OF CEPH
-# valid values are 'stable' and 'dev'
-ceph_install_source: stable
-
-# SUBNETS TO USE FOR THE VMS
-public_subnet: 192.168.9
-cluster_subnet: 192.168.10
-
-# 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: ceph/ubuntu-xenial
-#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: /
-# 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: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {ansible2.2}-{xenial_conf_tests,xenial_mon_osd,xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster}
+envlist = {ansible2.2}-{xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster}
 skipsdist = True
 
 [testenv]
@@ -17,12 +17,8 @@ deps=
   ansible2.2: ansible==2.2
   -r{toxinidir}/tests/requirements.txt
 changedir=
-  # test a 3 mon cluster and ensures ceph.conf is rendered correctly
-  xenial_conf_tests: {toxinidir}/tests/functional/ubuntu/16.04/mon
-  # tests a 1 mon 1 osd xenial cluster using raw_multi_journal OSD scenario
-  xenial_mon_osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using raw_multi_journal OSD scenario
-  xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd-mds-rgw
+  xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster
   # tests a 1 mon 1 osd centos7 cluster using journal_collocation OSD scenario
   journal_collocation: {toxinidir}/tests/functional/centos/7/journal-collocation
   # tests a 1 mon 1 osd centos7 cluster using dmcrypt_dedicated_journal OSD scenario
@@ -30,7 +26,7 @@ changedir=
   # tests a 1 mon 1 osd centos7 cluster using dmcrypt_journal_collocation OSD scenario
   dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/dmcrypt-journal-collocation
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using raw_multi_journal OSD scenario
-  centos7_cluster: {toxinidir}/tests/functional/centos/7/mon-osd-mds-rgw
+  centos7_cluster: {toxinidir}/tests/functional/centos/7/cluster
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker
   docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster
 commands=