ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
(cherry picked from commit fb1b5b3251)

# Conflicts:
#	tox-dashboard.ini
pull/4279/head
Guillaume Abrioux 2019-07-25 14:29:11 +02:00
parent 43d625b59a
commit 93826e061d
58 changed files with 61 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -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

2
group_vars/rhcs.yml.sample
View File

@ -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

2
roles/ceph-defaults/defaults/main.yml
View File

@ -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

1
tests/functional/add-mdss/container/group_vars/all
View File

@ -25,3 +25,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/add-mdss/group_vars/all
View File

@ -22,3 +22,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/add-mgrs/container/group_vars/all
View File

@ -26,3 +26,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/add-mgrs/group_vars/all
View File

@ -23,3 +23,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/add-mons/container/group_vars/all
View File

@ -26,3 +26,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/add-mons/group_vars/all
View File

@ -23,3 +23,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/add-osds/container/group_vars/all
View File

@ -25,3 +25,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/add-osds/group_vars/all
View File

@ -22,3 +22,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/add-rbdmirrors/container/group_vars/all
View File

@ -26,3 +26,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/add-rbdmirrors/group_vars/all
View File

@ -23,3 +23,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

2
tests/functional/add-rgws/container/group_vars/all
View File

@ -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

1
tests/functional/add-rgws/group_vars/all
View File

@ -23,3 +23,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

3
tests/functional/all_daemons/container/hosts
View File

@ -28,3 +28,6 @@ rbd-mirror0
[iscsigws]
iscsi-gw0
[grafana-server]
mon0

3
tests/functional/all_daemons/container/hosts-ubuntu
View File

@ -25,3 +25,6 @@ client1
[rbdmirrors]
rbd-mirror0
[grafana-server]
mon0

3
tests/functional/all_daemons/hosts
View File

@ -28,3 +28,6 @@ rbd-mirror0
[iscsigws]
iscsi-gw0 ceph_repository="dev"
[grafana-server]
mon0

3
tests/functional/all_daemons/hosts-switch-to-containers
View File

@ -20,3 +20,6 @@ rgw0
[clients]
client0
[grafana-server]
mon0

3
tests/functional/all_daemons/hosts-ubuntu
View File

@ -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 }}"

3
tests/functional/collocation/container/hosts
View File

@ -21,3 +21,6 @@ mds0
#[nfss]
#rgw0
#mds0
[grafana-server]
mon0

3
tests/functional/collocation/hosts
View File

@ -21,3 +21,6 @@ mds0
#[nfss]
#rgw0
#mds0
[grafana-server]
mon0

1
tests/functional/dashboard/Vagrantfile vendored
View File

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

26
tests/functional/dashboard/ceph-override.json
View File

@ -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"
}

1
tests/functional/dashboard/container/Vagrantfile vendored
View File

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

1
tests/functional/dashboard/container/ceph-override.json
View File

@ -1 +0,0 @@
../ceph-override.json

19
tests/functional/dashboard/container/group_vars/all
View File

@ -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

10
tests/functional/dashboard/container/group_vars/mons
View File

@ -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 }}"

10
tests/functional/dashboard/container/group_vars/osds
View File

@ -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

12
tests/functional/dashboard/container/hosts
View File

@ -1,12 +0,0 @@
[mons]
mon0 monitor_address=192.168.19.10
[mgrs]
mon0
[osds]
osd0
osd1
[grafana-server]
grafana0

15
tests/functional/dashboard/container/hosts-ubuntu
View File

@ -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']

61
tests/functional/dashboard/container/vagrant_variables.yml
View File

@ -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

11
tests/functional/dashboard/group_vars/all
View File

@ -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

10
tests/functional/dashboard/group_vars/mons
View File

@ -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 }}"

11
tests/functional/dashboard/group_vars/osds
View File

@ -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

12
tests/functional/dashboard/hosts
View File

@ -1,12 +0,0 @@
[mons]
mon0 monitor_address=192.168.25.10
[mgrs]
mon0
[osds]
osd0
osd1
[grafana-server]
grafana0

15
tests/functional/dashboard/hosts-ubuntu
View File

@ -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']

74
tests/functional/dashboard/vagrant_variables.yml
View File

@ -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

1
tests/functional/lvm-auto-discovery/container/group_vars/all
View File

@ -23,3 +23,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/lvm-auto-discovery/group_vars/all
View File

@ -16,3 +16,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/lvm-batch/container/group_vars/all
View File

@ -25,3 +25,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/lvm-batch/group_vars/all
View File

@ -18,3 +18,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/lvm-osds/container/group_vars/all
View File

@ -19,3 +19,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/lvm-osds/group_vars/all
View File

@ -13,3 +13,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/rgw-multisite/container/group_vars/all
View File

@ -25,3 +25,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/rgw-multisite/container/secondary/group_vars/all
View File

@ -25,3 +25,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/rgw-multisite/group_vars/all
View File

@ -22,3 +22,4 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/rgw-multisite/secondary/group_vars/all
View File

@ -23,3 +23,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

1
tests/functional/shrink_mds/container/group_vars/all
View File

@ -13,3 +13,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False

1
tests/functional/shrink_mds/group_vars/all
View File

@ -12,3 +12,4 @@ copy_admin_key: true
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/shrink_mgr/container/group_vars/all
View File

@ -13,3 +13,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False

1
tests/functional/shrink_mgr/group_vars/all
View File

@ -8,3 +8,4 @@ radosgw_interface: eth1
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/shrink_mon/container/group_vars/all
View File

@ -13,3 +13,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False

1
tests/functional/shrink_mon/group_vars/all
View File

@ -6,3 +6,4 @@ cluster_network: "192.168.2.0/24"
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False

1
tests/functional/shrink_osd/container/group_vars/all
View File

@ -13,3 +13,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False

1
tests/functional/shrink_osd/group_vars/all
View File

@ -7,3 +7,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 3
openstack_config: False
dashboard_enabled: False

1
tests/functional/shrink_rbdmirror/container/group_vars/all
View File

@ -12,3 +12,4 @@ ceph_conf_overrides:
global:
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False

1
tests/functional/shrink_rbdmirror/group_vars/all
View File

@ -10,3 +10,4 @@ copy_admin_key: true
ceph_conf_overrides:
global:
osd_pool_default_size: 1
dashboard_enabled: False