diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index de218b880..ab26caa9e 100644 --- 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 5836cb725..2442a5335 100644 --- 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 4cb385008..e72d07271 100644 --- 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 389bf9e14..99ef18633 100644 --- 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 4ce40af30..a04c2b3f2 100644 --- 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 ec9cad34a..8f38b0369 100644 --- 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 3d61e7e0b..62f4bd40a 100644 --- 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 84725f5d5..59f694283 100644 --- 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 fa9a11138..410a60c2b 100644 --- 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 8c484f9ab..1c034763c 100644 --- 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 7e6c13112..663a4b1d0 100644 --- 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 edaeef95a..bdaad7a6a 100644 --- 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 29f71b595..7bf0324e8 100644 --- 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 55c2381c3..705cfca71 100644 --- 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 f6696fb7e..819b3bbd0 100644 --- 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 1f2f0a4f1..056563a6f 100644 --- 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 d0adf6308..7a8fc4092 100644 --- 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 eb0b509c1..0bc619545 100644 --- 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 4fb943738..4c8af9000 100644 --- 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 0c2eed779..550130871 100644 --- 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 c7d3d34c6..e7f31bfdf 100644 --- 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 c7d3d34c6..e7f31bfdf 100644 --- 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 index 706a5bb47..000000000 --- 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 index e7d6137a6..000000000 --- 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 index 16076e424..000000000 --- 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 index 772bdc5f5..000000000 --- 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 index 9fab0936f..000000000 --- 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 index 8a91e9612..000000000 --- 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 index 9cea91d6a..000000000 --- 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 index 3b452d016..000000000 --- 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 index 8fc180d94..000000000 --- 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 index 7622a8dbd..000000000 --- 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 index 88aa1ea96..000000000 --- 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 index 346335178..000000000 --- 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 index 3ec1d6e4c..000000000 --- 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 index 8642081a6..000000000 --- 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 index 59cc4b0d1..000000000 --- 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 index 51fe34e35..000000000 --- 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 742d0c45a..9a3c5ddfb 100644 --- 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 99dc63fe0..12f8276cd 100644 --- 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 5265e2cf1..5e1dfc732 100644 --- 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 fb6611b32..7f73d3b11 100644 --- 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 f6c948876..0c8f3f9bd 100644 --- 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 8af6d39e9..37c747c7d 100644 --- 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 c451e157c..7087c53a6 100644 --- 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 2c42970c6..35a3ce6c7 100644 --- 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 b89bd8206..c3e831f5a 100644 --- 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 0fb25fb51..ebb9e53d1 100644 --- 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 1591f6249..cab635755 100644 --- 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 63f9bd972..737913f24 100644 --- 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 618aa44fc..bb6a1d4d6 100644 --- 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 ca96be52c..125a749ee 100644 --- 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 bdb856c91..78dc17390 100644 --- 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 941aad208..c16cacd74 100644 --- 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 e17f8f7bc..c9f7e9983 100644 --- 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 6cd017ce1..6cc7c95da 100644 --- 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 88d8f201f..f380626a6 100644 --- 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 e3567cb48..073a710ad 100644 --- 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 index 8001e2dcb..000000000 --- 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