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>
pull/4285/head
Guillaume Abrioux 2019-07-25 14:29:11 +02:00
parent 07c6695d16
commit fb1b5b3251
59 changed files with 61 additions and 365 deletions

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

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

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

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

View File

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

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

View File

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

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

View File

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

View File

@ -24,4 +24,5 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

View File

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

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

View File

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

View File

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

View File

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

View File

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

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

View File

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

View File

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

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

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

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

View File

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

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

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

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

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

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

View File

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

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

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

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

View File

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

View File

@ -24,4 +24,5 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

View File

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

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

View File

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

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

View File

@ -24,4 +24,5 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

View File

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

View File

@ -22,4 +22,5 @@ os_tuning_params:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp
ceph_osd_docker_run_script_path: /var/tmp
dashboard_enabled: False

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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
osd_pool_default_size: 1
dashboard_enabled: False

View File

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

View File

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

View File

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

View File

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

View File

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