dashboard: enable dashboard by default

This commit enables dashboard deployment by default.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1726739
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index de218b880f74f502e1592b72eddc3ff85e4bc566..ab26caa9ef37eabdb21f41b467faf037b217d7e8 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -700,7 +700,7 @@ dummy:
 #############
 # DASHBOARD #
 #############
-#dashboard_enabled: False
+#dashboard_enabled: True
 # Choose http or https
 # For https, you should set dashboard.crt/key and grafana.crt/key
 #dashboard_protocol: http

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 5836cb725419e4593ae6fd9853902b8a5a53ca6e..2442a5335ede9010cd1cc40c5bb7d232ac3663d6 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -700,7 +700,7 @@ ceph_docker_registry: "registry.access.redhat.com"
 #############
 # DASHBOARD #
 #############
-#dashboard_enabled: False
+#dashboard_enabled: True
 # Choose http or https
 # For https, you should set dashboard.crt/key and grafana.crt/key
 #dashboard_protocol: http

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 4cb38500809bebbf52824a7fd4a9983f50dd9277..e72d072713344075715b2bb8dbcb23f9b541376e 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -692,7 +692,7 @@ openstack_keys:
 #############
 # DASHBOARD #
 #############
-dashboard_enabled: False
+dashboard_enabled: True
 # Choose http or https
 # For https, you should set dashboard.crt/key and grafana.crt/key
 dashboard_protocol: http

diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all
index 389bf9e14c5f6da53cf51ef111555f27d3694aca..99ef186333afdee93bd06d61c30c35a92adeccf8 100644 (file)
--- a/tests/functional/add-mdss/container/group_vars/all
+++ b/tests/functional/add-mdss/container/group_vars/all
@@ -25,3 +25,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-mdss/group_vars/all b/tests/functional/add-mdss/group_vars/all
index 4ce40af30b70ebc8d5dcc3bd95c2b3246347f006..a04c2b3f22f4cc51982af4dc34815650191a1d04 100644 (file)
--- a/tests/functional/add-mdss/group_vars/all
+++ b/tests/functional/add-mdss/group_vars/all
@@ -22,3 +22,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all
index ec9cad34a1c11f672e711272279fbb1f3883fea4..8f38b036945a7f4833f9804843c06d4200bdf24d 100644 (file)
--- a/tests/functional/add-mgrs/container/group_vars/all
+++ b/tests/functional/add-mgrs/container/group_vars/all
@@ -26,3 +26,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-mgrs/group_vars/all b/tests/functional/add-mgrs/group_vars/all
index 3d61e7e0b56a1e8b3f622e4612d2bdbbde47f463..62f4bd40adc9e196947f7fd37ce718356e0f0da1 100644 (file)
--- a/tests/functional/add-mgrs/group_vars/all
+++ b/tests/functional/add-mgrs/group_vars/all
@@ -23,3 +23,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ 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
index 84725f5d5275fa577f608e5cf6ba6430a3d12758..59f694283cb487628486c24b4b9358ebe504650e 100644 (file)
--- a/tests/functional/add-mons/container/group_vars/all
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -26,3 +26,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-mons/group_vars/all b/tests/functional/add-mons/group_vars/all
index fa9a1113822c7776368563d721ec3b46f6850e24..410a60c2b10a80d1a203f4169b24c797bca83203 100644 (file)
--- a/tests/functional/add-mons/group_vars/all
+++ b/tests/functional/add-mons/group_vars/all
@@ -23,3 +23,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 8c484f9ab074d03c945bb2320c70e951d1102a02..1c034763c056916e8e880144083582ed13501854 100644 (file)
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -24,4 +24,5 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
-ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
+ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-osds/group_vars/all b/tests/functional/add-osds/group_vars/all
index 7e6c1311250fc7e120fd574072efd68a9caca172..663a4b1d07bdebef39a493265376258c88fc8049 100644 (file)
--- a/tests/functional/add-osds/group_vars/all
+++ b/tests/functional/add-osds/group_vars/all
@@ -22,3 +22,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ 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
index edaeef95aa5a873075a6156ab34017ccedc95fc7..bdaad7a6ad3728c036f852854b57cf0e01da9bd7 100644 (file)
--- a/tests/functional/add-rbdmirrors/container/group_vars/all
+++ b/tests/functional/add-rbdmirrors/container/group_vars/all
@@ -26,3 +26,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-rbdmirrors/group_vars/all b/tests/functional/add-rbdmirrors/group_vars/all
index 29f71b595ef89f158d2e8616f4a259701b369da0..7bf0324e86dac446c507bd38c3d6393a2b5d0148 100644 (file)
--- a/tests/functional/add-rbdmirrors/group_vars/all
+++ b/tests/functional/add-rbdmirrors/group_vars/all
@@ -23,3 +23,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all
index 55c2381c370cbf222aaf4a42b4f2d0f4048fa44f..705cfca71b237acfef953ec1721e9b96360956a6 100644 (file)
--- a/tests/functional/add-rgws/container/group_vars/all
+++ b/tests/functional/add-rgws/container/group_vars/all
@@ -28,4 +28,4 @@ ceph_conf_overrides:
 ceph_osd_docker_run_script_path: /var/tmp
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
-
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-rgws/group_vars/all b/tests/functional/add-rgws/group_vars/all
index f6696fb7e5f48beb72101bb98a3f35d976e5d332..819b3bbd04e8f55eac29bc4b415e6ec898c8336e 100644 (file)
--- a/tests/functional/add-rgws/group_vars/all
+++ b/tests/functional/add-rgws/group_vars/all
@@ -23,3 +23,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts
index 1f2f0a4f1abfbd62d1630a4deddc35c9705d06f2..056563a6f5fb1cf08fe78fbbaad6c11c768d530a 100644 (file)
--- a/tests/functional/all_daemons/container/hosts
+++ b/tests/functional/all_daemons/container/hosts
@@ -28,3 +28,6 @@ rbd-mirror0
 
 [iscsigws]
 iscsi-gw0
+
+[grafana-server]
+mon0
\ No newline at end of file

diff --git a/tests/functional/all_daemons/container/hosts-ubuntu b/tests/functional/all_daemons/container/hosts-ubuntu
index d0adf6308ed057a8533d636cdfe9ae0f9721a3dd..7a8fc4092372023b3b604f9883730336859d5a93 100644 (file)
--- a/tests/functional/all_daemons/container/hosts-ubuntu
+++ b/tests/functional/all_daemons/container/hosts-ubuntu
@@ -25,3 +25,6 @@ client1
 
 [rbdmirrors]
 rbd-mirror0
+
+[grafana-server]
+mon0
\ No newline at end of file

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index eb0b509c146d20d5e791f0902b266794831c6ac6..0bc6195455e04964f0338e1398015d4b8328879b 100644 (file)
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -28,3 +28,6 @@ rbd-mirror0
 
 [iscsigws]
 iscsi-gw0 ceph_repository="dev"
+
+[grafana-server]
+mon0
\ No newline at end of file

diff --git a/tests/functional/all_daemons/hosts-switch-to-containers b/tests/functional/all_daemons/hosts-switch-to-containers
index 4fb943738f6ed4e5e985c49f3fb8562fec05eb76..4c8af90009e7462991ad0a07798769e7e4c92c6a 100644 (file)
--- a/tests/functional/all_daemons/hosts-switch-to-containers
+++ b/tests/functional/all_daemons/hosts-switch-to-containers
@@ -20,3 +20,6 @@ rgw0
 
 [clients]
 client0
+
+[grafana-server]
+mon0
\ No newline at end of file

diff --git a/tests/functional/all_daemons/hosts-ubuntu b/tests/functional/all_daemons/hosts-ubuntu
index 0c2eed779d03705687f556b0145a4b74be1221b8..550130871736b90b7ff5810b6bc08a9f827c779b 100644 (file)
--- a/tests/functional/all_daemons/hosts-ubuntu
+++ b/tests/functional/all_daemons/hosts-ubuntu
@@ -26,6 +26,9 @@ client1
 [rbdmirrors]
 rbd-mirror0
 
+[grafana-server]
+mon0
+
 [all:vars]
 debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse']
 nfs_ganesha_stable_deb_repo="{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}"

diff --git a/tests/functional/collocation/container/hosts b/tests/functional/collocation/container/hosts
index c7d3d34c68af8175e1eaf4821948620ac98f66ad..e7f31bfdfb0eaae79b5e31dfe76345566dbf51d0 100644 (file)
--- a/tests/functional/collocation/container/hosts
+++ b/tests/functional/collocation/container/hosts
@@ -21,3 +21,6 @@ mds0
 #[nfss]
 #rgw0
 #mds0
+
+[grafana-server]
+mon0
\ No newline at end of file

diff --git a/tests/functional/collocation/hosts b/tests/functional/collocation/hosts
index c7d3d34c68af8175e1eaf4821948620ac98f66ad..e7f31bfdfb0eaae79b5e31dfe76345566dbf51d0 100644 (file)
--- a/tests/functional/collocation/hosts
+++ b/tests/functional/collocation/hosts
@@ -21,3 +21,6 @@ mds0
 #[nfss]
 #rgw0
 #mds0
+
+[grafana-server]
+mon0
\ No newline at end of file

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

diff --git a/tests/functional/dashboard/ceph-override.json b/tests/functional/dashboard/ceph-override.json
deleted file mode 100644 (file)
index e7d6137..0000000
--- a/tests/functional/dashboard/ceph-override.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "ceph_conf_overrides": {
-    "global": {
-      "osd_pool_default_pg_num": 12,
-      "osd_pool_default_size": 1,
-      "debug_ms": 20
-    },
-    "osd": {
-      "debug_bluefs": 20,
-      "debug_bluestore": 20
-    }
-  },
-  "cephfs_pools": [
-    {
-      "name": "cephfs_metadata",
-      "pgs": 8,
-      "size": 1
-    },
-    {
-      "name": "cephfs_data",
-      "pgs": 8,
-      "size": 1
-    }
-  ],
-  "ceph_mon_docker_memory_limit": "2g"
-}

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

diff --git a/tests/functional/dashboard/container/ceph-override.json b/tests/functional/dashboard/container/ceph-override.json
deleted file mode 120000 (symlink)
index 772bdc5..0000000
--- a/tests/functional/dashboard/container/ceph-override.json
+++ /dev/null
@@ -1 +0,0 @@
-../ceph-override.json
\ No newline at end of file

diff --git a/tests/functional/dashboard/container/group_vars/all b/tests/functional/dashboard/container/group_vars/all
deleted file mode 100644 (file)
index 9fab093..0000000
--- a/tests/functional/dashboard/container/group_vars/all
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# this is only here to let the CI tests know
-# that this scenario is using docker
-docker: True
-
-containerized_deployment: True
-monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
-radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
-ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
-public_network: "192.168.19.0/24"
-cluster_network: "192.168.20.0/24"
-rgw_override_bucket_index_max_shards: 16
-rgw_bucket_default_quota_max_objects: 1638400
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
-openstack_config: False
-dashboard_enabled: True
\ No newline at end of file

diff --git a/tests/functional/dashboard/container/group_vars/mons b/tests/functional/dashboard/container/group_vars/mons
deleted file mode 100644 (file)
index 8a91e96..0000000
--- a/tests/functional/dashboard/container/group_vars/mons
+++ /dev/null
@@ -1,10 +0,0 @@
----
-create_crush_tree: False
-crush_rule_config: False
-crush_rule_hdd:
-  name: HDD
-  root: HDD
-  type: host
-  default: true
-crush_rules:
-  - "{{ crush_rule_hdd }}"

diff --git a/tests/functional/dashboard/container/group_vars/osds b/tests/functional/dashboard/container/group_vars/osds
deleted file mode 100644 (file)
index 9cea91d..0000000
--- a/tests/functional/dashboard/container/group_vars/osds
+++ /dev/null
@@ -1,10 +0,0 @@
----
-ceph_osd_docker_run_script_path: /var/tmp
-osd_objectstore: "bluestore"
-lvm_volumes:
-  - data: data-lv1
-    data_vg: test_group
-  - data: data-lv2
-    data_vg: test_group
-    db: journal1
-    db_vg: journals
\ No newline at end of file

diff --git a/tests/functional/dashboard/container/hosts b/tests/functional/dashboard/container/hosts
deleted file mode 100644 (file)
index 3b452d0..0000000
--- a/tests/functional/dashboard/container/hosts
+++ /dev/null
@@ -1,12 +0,0 @@
-[mons]
-mon0 monitor_address=192.168.19.10
-
-[mgrs]
-mon0
-
-[osds]
-osd0
-osd1
-
-[grafana-server]
-grafana0
\ No newline at end of file

diff --git a/tests/functional/dashboard/container/hosts-ubuntu b/tests/functional/dashboard/container/hosts-ubuntu
deleted file mode 100644 (file)
index 8fc180d..0000000
--- a/tests/functional/dashboard/container/hosts-ubuntu
+++ /dev/null
@@ -1,15 +0,0 @@
-[mons]
-mon0 monitor_address=192.168.19.10
-
-[mgrs]
-mon0
-
-[osds]
-osd0
-osd1
-
-[grafana-server]
-grafana0
-
-[all:vars]
-debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse']

diff --git a/tests/functional/dashboard/container/vagrant_variables.yml b/tests/functional/dashboard/container/vagrant_variables.yml
deleted file mode 100644 (file)
index 7622a8d..0000000
--- a/tests/functional/dashboard/container/vagrant_variables.yml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: True
-
-# DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 1
-osd_vms: 2
-mds_vms: 0
-rgw_vms: 0
-nfs_vms: 0
-grafana_server_vms: 0
-rbd_mirror_vms: 0
-client_vms: 0
-iscsi_gw_vms: 0
-mgr_vms: 0
-
-# SUBNETS TO USE FOR THE VMS
-public_subnet: 192.168.19
-cluster_subnet: 192.168.20
-
-# MEMORY
-# set 1024 for CentOS
-memory: 1024
-
-# Disks
-# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"
-# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]"
-disks: "[ '/dev/sda', '/dev/sdb' ]"
-
-# 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
-#client_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

diff --git a/tests/functional/dashboard/group_vars/all b/tests/functional/dashboard/group_vars/all
deleted file mode 100644 (file)
index 88aa1ea..0000000
--- a/tests/functional/dashboard/group_vars/all
+++ /dev/null
@@ -1,11 +0,0 @@
----
-ceph_origin: repository
-ceph_repository: community
-public_network: "192.168.25.0/24"
-cluster_network: "192.168.26.0/24"
-radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
-openstack_config: False
-dashboard_enabled: True
\ No newline at end of file

diff --git a/tests/functional/dashboard/group_vars/mons b/tests/functional/dashboard/group_vars/mons
deleted file mode 100644 (file)
index 3463351..0000000
--- a/tests/functional/dashboard/group_vars/mons
+++ /dev/null
@@ -1,10 +0,0 @@
----
-create_crush_tree: False
-crush_rule_config: False
-crush_rule_hdd:
-  name: HDD
-  root: HDD
-  type: host
-  default: true
-crush_rules:
-  - "{{ crush_rule_hdd }}"
\ No newline at end of file

diff --git a/tests/functional/dashboard/group_vars/osds b/tests/functional/dashboard/group_vars/osds
deleted file mode 100644 (file)
index 3ec1d6e..0000000
--- a/tests/functional/dashboard/group_vars/osds
+++ /dev/null
@@ -1,11 +0,0 @@
----
-os_tuning_params:
-  - { name: fs.file-max, value: 26234859 }
-osd_objectstore: "bluestore"
-lvm_volumes:
-  - data: data-lv1
-    data_vg: test_group
-  - data: data-lv2
-    data_vg: test_group
-    db: journal1
-    db_vg: journals
\ No newline at end of file

diff --git a/tests/functional/dashboard/hosts b/tests/functional/dashboard/hosts
deleted file mode 100644 (file)
index 8642081..0000000
--- a/tests/functional/dashboard/hosts
+++ /dev/null
@@ -1,12 +0,0 @@
-[mons]
-mon0 monitor_address=192.168.25.10
-
-[mgrs]
-mon0
-
-[osds]
-osd0
-osd1
-
-[grafana-server]
-grafana0
\ No newline at end of file

diff --git a/tests/functional/dashboard/hosts-ubuntu b/tests/functional/dashboard/hosts-ubuntu
deleted file mode 100644 (file)
index 59cc4b0..0000000
--- a/tests/functional/dashboard/hosts-ubuntu
+++ /dev/null
@@ -1,15 +0,0 @@
-[mons]
-mon0 monitor_address=192.168.25.10
-
-[mgrs]
-mon0
-
-[osds]
-osd0
-osd1
-
-[grafana-server]
-grafana0
-
-[all:vars]
-debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse']

diff --git a/tests/functional/dashboard/vagrant_variables.yml b/tests/functional/dashboard/vagrant_variables.yml
deleted file mode 100644 (file)
index 51fe34e..0000000
--- a/tests/functional/dashboard/vagrant_variables.yml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: false
-
-# DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 1
-osd_vms: 2
-mds_vms: 0
-rgw_vms: 0
-nfs_vms: 0
-grafana_server_vms: 1
-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.25
-cluster_subnet: 192.168.26
-
-# 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 }
-
-# VM prefix name, need to match the hostname
-# label_prefix: ceph

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index 742d0c45ad69c9b55bc4c2dcff1fddaf167bf081..9a3c5ddfb8581abb44dde8828fc88102ade887d5 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -23,3 +23,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/lvm-auto-discovery/group_vars/all b/tests/functional/lvm-auto-discovery/group_vars/all
index 99dc63fe060769ab92407358db81b0bad0f9927d..12f8276cdb1411f452bdf879106925b9531db809 100644 (file)
--- a/tests/functional/lvm-auto-discovery/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/group_vars/all
@@ -16,3 +16,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index 5265e2cf1496144704514700eea7f4855497fdc9..5e1dfc73280a040b9b633a178e37891d8131da52 100644 (file)
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -24,4 +24,5 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
-ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
+ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/lvm-batch/group_vars/all b/tests/functional/lvm-batch/group_vars/all
index fb6611b329aea2f84a465ff3182b0f2dc25108f8..7f73d3b113864b89a25188c551205f310f380d3a 100644 (file)
--- a/tests/functional/lvm-batch/group_vars/all
+++ b/tests/functional/lvm-batch/group_vars/all
@@ -18,3 +18,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index f6c948876f21ec92c9cc4e5b27684b1666a7e20d..0c8f3f9bd64a6780141b401254f21ec7ade215de 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -19,3 +19,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all
index 8af6d39e9d91a29f4d9e9b0527f56d17dc064eac..37c747c7daa101f1642fd32a84b60c7a6b2089c1 100644 (file)
--- a/tests/functional/lvm-osds/group_vars/all
+++ b/tests/functional/lvm-osds/group_vars/all
@@ -13,3 +13,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all
index c451e157c8342de447e7bfc5cff9252618abec8c..7087c53a6482faca62c5de101f61c8c1a5a54724 100644 (file)
--- a/tests/functional/rgw-multisite/container/group_vars/all
+++ b/tests/functional/rgw-multisite/container/group_vars/all
@@ -25,3 +25,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all
index 2c42970c6f26173c39cbd3aa32fe27a8e4fc3445..35a3ce6c76b6e5ea76e94b5060a41add8e91e624 100644 (file)
--- a/tests/functional/rgw-multisite/container/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all
@@ -24,4 +24,5 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
-ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
+ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/rgw-multisite/group_vars/all b/tests/functional/rgw-multisite/group_vars/all
index b89bd8206059acec8b7d4435ebdd53f8c3b1b4a7..c3e831f5adc51786e053acbbf08abce03681ccbf 100644 (file)
--- a/tests/functional/rgw-multisite/group_vars/all
+++ b/tests/functional/rgw-multisite/group_vars/all
@@ -22,3 +22,4 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/rgw-multisite/secondary/group_vars/all b/tests/functional/rgw-multisite/secondary/group_vars/all
index 0fb25fb51e93d0428c865a00ec24032bdad705b7..ebb9e53d1c3f08347e9d945848549f972352bff7 100644 (file)
--- a/tests/functional/rgw-multisite/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/secondary/group_vars/all
@@ -22,4 +22,5 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
-ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
+ceph_osd_docker_run_script_path: /var/tmp
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index 1591f62495f1bb962841e8ffce920d73ab3af656..cab6357556779077223bcf27b3c094fbd89fccfc 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -13,3 +13,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 openstack_config: False
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mds/group_vars/all b/tests/functional/shrink_mds/group_vars/all
index 63f9bd9728f7d82ae434555654f246053dd1e593..737913f244c70243ebb92c30534fa6840640100e 100644 (file)
--- a/tests/functional/shrink_mds/group_vars/all
+++ b/tests/functional/shrink_mds/group_vars/all
@@ -12,3 +12,4 @@ copy_admin_key: true
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index 618aa44fcccc83fe7a85240dd2c3ac02b00a01a1..bb6a1d4d6ba005feab45d1c67a09c1d7b305e10c 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -13,3 +13,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 openstack_config: False
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/group_vars/all b/tests/functional/shrink_mgr/group_vars/all
index ca96be52c473b038ac10d8c6eaf90442a4dc5eb8..125a749eec0c014f3ba11d4eecc0966f9bb0e5be 100644 (file)
--- a/tests/functional/shrink_mgr/group_vars/all
+++ b/tests/functional/shrink_mgr/group_vars/all
@@ -8,3 +8,4 @@ radosgw_interface: eth1
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index bdb856c911f6f443aeeb1e766930f5067ccffc53..78dc17390cf0bd008e40a1e44ee3dade6d748439 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -13,3 +13,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 openstack_config: False
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mon/group_vars/all b/tests/functional/shrink_mon/group_vars/all
index 941aad208f940dbac30118f515b532d3c7ccdd5a..c16cacd74a8fb18a5acde1262d6e62f9eb3ed0d5 100644 (file)
--- a/tests/functional/shrink_mon/group_vars/all
+++ b/tests/functional/shrink_mon/group_vars/all
@@ -5,4 +5,5 @@ public_network: "192.168.1.0/24"
 cluster_network: "192.168.2.0/24"
 ceph_conf_overrides:
   global:
-    osd_pool_default_size: 1
\ No newline at end of file
+    osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index e17f8f7bc78aae1fa3ff967d261b42225bb1926e..c9f7e998300f8f53086e103e23c8a92550d48b44 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -13,3 +13,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 openstack_config: False
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_osd/group_vars/all b/tests/functional/shrink_osd/group_vars/all
index 6cd017ce17fb3baeb80f6042fcc553dfbdb1afec..6cc7c95da41e2ab4ae720018cc6e55c2b52d0e84 100644 (file)
--- a/tests/functional/shrink_osd/group_vars/all
+++ b/tests/functional/shrink_osd/group_vars/all
@@ -7,3 +7,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 3
 openstack_config: False
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all
index 88d8f201f3b5dae6039379e20e35781a36a4dda5..f380626a66b77b1ec4c94055846b175f567d0209 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -12,3 +12,4 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 openstack_config: False
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_rbdmirror/group_vars/all b/tests/functional/shrink_rbdmirror/group_vars/all
index e3567cb481f8098a9160ad09f3d941c10fa6ce7a..073a710ad659cc8fe9b801357d00baec85973ecc 100644 (file)
--- a/tests/functional/shrink_rbdmirror/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/group_vars/all
@@ -10,3 +10,4 @@ copy_admin_key: true
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tox-dashboard.ini b/tox-dashboard.ini
deleted file mode 100644 (file)
index 8001e2d..0000000
--- a/tox-dashboard.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-[tox]
-envlist = dev-{centos,ubuntu}-{container,non_container}-dashboard
-
-skipsdist = True
-
-[testenv]
-whitelist_externals =
-    vagrant
-    bash
-    cp
-    git
-    pip
-passenv=*
-setenv=
-  ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey
-  ANSIBLE_CONFIG = {toxinidir}/ansible.cfg
-  ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions
-  ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback
-  ANSIBLE_CALLBACK_WHITELIST = profile_tasks
-  ANSIBLE_CACHE_PLUGIN = memory
-  ANSIBLE_GATHERING = implicit
-  # only available for ansible >= 2.5
-  ANSIBLE_STDOUT_CALLBACK = yaml
-#  non_container: DEV_SETUP = True
-  # Set the vagrant box image to use
-  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
-  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
-  ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64
-
-  # Set the ansible inventory host file to be used according to which distrib we are running on
-  ubuntu: _INVENTORY = hosts-ubuntu
-  INVENTORY = {env:_INVENTORY:hosts}
-  container: CONTAINER_DIR = /container
-  container: PLAYBOOK = site-docker.yml.sample
-  non_container: PLAYBOOK = site.yml.sample
-
-  CEPH_DOCKER_IMAGE_TAG = latest-nautilus
-  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-nautilus
-  CEPH_DOCKER_IMAGE_TAG = latest-master
-  CEPH_DEV_BRANCH = master
-  CEPH_DEV_SHA1 = latest
-  CEPH_STABLE_RELEASE = nautilus
-
-deps= -r{toxinidir}/tests/requirements.txt
-changedir={toxinidir}/tests/functional/dashboard{env:CONTAINER_DIR:}
-commands=
-  vagrant up --no-provision {posargs:--provider=virtualbox}
-  bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
-
-  ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml
-
-  # configure lvm
-  ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --extra-vars "osd_scenario=lvm"
-
-  non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
-  ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK} --extra-vars "\
-      fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
-      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
-      ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \
-      ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-master} \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
-  "
-
-  bash -c "CEPH_STABLE_RELEASE={env:CEPH_STABLE_RELEASE:nautilus} py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests"
-
-  vagrant destroy --force