Synchronise configuration with kayobe 3.1.0

This commit is contained in:
Mark Goddard 2018-03-01 18:30:27 +00:00
parent 663bf95e4c
commit d3c1c01b6f
10 changed files with 222 additions and 1 deletions

10
etc/kayobe/cadvisor.yml Normal file
View File

@ -0,0 +1,10 @@
---
###############################################################################
# cAdvisor configuration.
# Whether cAdvisor is enabled.
#cadvisor_enabled:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

View File

@ -83,6 +83,16 @@
# Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking.
#compute_lvm_group_data_lv_docker_volumes_fs:
###############################################################################
# Compute node Ceph configuration.
# List of Ceph disks.
# The format is a list of dict like :
# - { osd: "/dev/sdb", journal: "/dev/sdc" }
# - { osd: "/dev/sdd" }
# Journal variable is not mandatory.
#compute_ceph_disks:
###############################################################################
# Compute node sysctl configuration.

View File

@ -86,6 +86,16 @@
# Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking.
#controller_lvm_group_data_lv_docker_volumes_fs:
###############################################################################
# Controller node Ceph configuration.
# List of Ceph disks.
# The format is a list of dict like :
# - { osd: "/dev/sdb", journal: "/dev/sdc" }
# - { osd: "/dev/sdd" }
# Journal variable is not mandatory.
#controller_ceph_disks:
###############################################################################
# Controller node sysctl configuration.

47
etc/kayobe/grafana.yml Normal file
View File

@ -0,0 +1,47 @@
---
###############################################################################
# Grafana configuration.
# Grafana local admin user name. If you are deploying Monasca Grafana this
# should not conflict with an OpenStack user name.
#grafana_local_admin_user_name:
# Path to git repo containing Grafana dashboards. Eg.
# https://github.com/stackhpc/grafana-reference-dashboards.git
#grafana_monitoring_node_dashboard_repo:
# Dashboard repo version. Optional, defaults to 'HEAD'.
#grafana_monitoring_node_dashboard_repo_version:
# Path to which Grafana dashboards will be cloned to a monitoring node
#grafana_monitoring_node_dashboard_repo_checkout_path:
# The path, relative to the grafana_monitoring_node_dashboard_repo_checkout_path
# containing the dashboards. Eg. /prometheus/control_plane
#grafana_monitoring_node_dashboard_repo_path:
# The Grafana organisation for the control plane. Note that for Monasca
# Grafana with domain support the format is:
# organisation_name@openstack_domain
#grafana_control_plane_organisation:
# A dict of datasources to configure. See the stackhpc.grafana-conf role
# for all supported datasources. Example:
#
# grafana_datasources:
# monasca_api:
# port: 8082
# host: monasca-api
# monasca_log_api:
# port: 5607
# host: monasca-log-api
# elasticsearch:
# port: 9200
# host: monasca-elasticsearch
# project_id: "some_id"
#
#grafana_datasources:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

View File

@ -1,7 +1,6 @@
# Kayobe hosts inventory file. This file should be modified to define the hosts
# and their top-level group membership.
[config-mgmt]
# This host acts as the configuration management control host. This must be
# localhost.
localhost ansible_connection=local

View File

@ -65,6 +65,13 @@
# raid_interface field set.
#kolla_ironic_default_raid_interface:
# Specify the list of rescue interfaces to load during service initialization.
#kolla_ironic_enabled_rescue_interfaces:
# Default rescue interface to be used for nodes that do not have
# rescue_interface field set.
#kolla_ironic_default_rescue_interface:
# Specify the list of storage interfaces to load during
# service initialization.
#kolla_ironic_enabled_storage_interfaces:

View File

@ -131,6 +131,10 @@
###############################################################################
# Kolla-ansible configuration.
# Virtualenv directory where Kolla-ansible's ansible modules will execute
# remotely on the target nodes. If None, no virtualenv will be used.
#kolla_ansible_target_venv:
# Whether TLS is enabled for the external API endpoints.
#kolla_enable_tls_external:
@ -176,6 +180,7 @@
#kolla_enable_manila_backend_generic:
#kolla_enable_manila_backend_hnas:
#kolla_enable_mistral:
#kolla_enable_monasca:
#kolla_enable_mongodb:
#kolla_enable_multipathd:
#kolla_enable_murano:

View File

@ -13,6 +13,21 @@
# should not be added to the inventory.
#overcloud_group_hosts_map:
# To prevent some network issues you can choose to disable cloud-init
#disable_cloud_init:
###############################################################################
# Overcloud host image configuration.
# The CentOS cloud images from 7.2 (1511) onwards have a bogus name server
# entry in /etc/resolv.conf, 10.0.2.3. Cloud-init only appends name server
# entries to this file, and will not remove this bogus entry. Typically this
# leads to a delay of around 30 seconds when connecting via SSH, due to a
# timeout in NSS. The workaround employed here is to remove this bogus entry
# from the image using virt-customize, if it exists. See
# https://bugs.centos.org/view.php?id=14369.
#overcloud_host_image_workaround_resolv_enabled:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

View File

@ -1,4 +1,11 @@
---
###############################################################################
# Seed hypervisor node configuration.
# User with which to access the seed hypervisor via SSH during bootstrap, in
# order to setup the Kayobe user account.
#seed_hypervisor_bootstrap_user:
###############################################################################
# Seed hypervisor network interface configuration.

111
etc/kayobe/storage.yml Normal file
View File

@ -0,0 +1,111 @@
---
###############################################################################
# Storage node configuration.
# User with which to access the storages via SSH during bootstrap, in order
# to setup the Kayobe user account.
#storage_bootstrap_user:
###############################################################################
# Network interface attachments.
# List of networks to which storage nodes are attached.
#storage_network_interfaces:
# List of default networks to which storage nodes are attached.
#storage_default_network_interfaces:
# List of extra networks to which storage nodes are attached.
#storage_extra_network_interfaces:
###############################################################################
# Storage node BIOS configuration.
# Dict of storage BIOS options. Format is same as that used by stackhpc.drac
# role.
#storage_bios_config:
# Dict of default storage BIOS options. Format is same as that used by
# stackhpc.drac role.
#storage_bios_config_default:
# Dict of additional storage BIOS options. Format is same as that used by
# stackhpc.drac role.
#storage_bios_config_extra:
###############################################################################
# Storage node RAID configuration.
# List of storage RAID volumes. Format is same as that used by stackhpc.drac
# role.
#storage_raid_config:
# List of default storage RAID volumes. Format is same as that used by
# stackhpc.drac role.
#storage_raid_config_default:
# List of additional storage RAID volumes. Format is same as that used by
# stackhpc.drac role.
#storage_raid_config_extra:
###############################################################################
# Storage node LVM configuration.
# List of storage volume groups. See mrlesmithjr.manage-lvm role for
# format.
#storage_lvm_groups:
# Default list of storage volume groups. See mrlesmithjr.manage-lvm role for
# format.
#storage_lvm_groups_default:
# Additional list of storage volume groups. See mrlesmithjr.manage-lvm role
# for format.
#storage_lvm_groups_extra:
# Storage LVM volume group for data. See mrlesmithjr.manage-lvm role for
# format.
#storage_lvm_group_data:
# List of disks for use by storage LVM data volume group. Default to an
# invalid value to require configuration.
#storage_lvm_group_data_disks:
# List of LVM logical volumes for the data volume group.
#storage_lvm_group_data_lvs:
# Docker volumes LVM backing volume.
#storage_lvm_group_data_lv_docker_volumes:
# Size of docker volumes LVM backing volume.
#storage_lvm_group_data_lv_docker_volumes_size:
# Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking.
#storage_lvm_group_data_lv_docker_volumes_fs:
###############################################################################
# Storage node Ceph configuration.
# List of Ceph disks.
# The format is a list of dict like :
# - { osd: "/dev/sdb", journal: "/dev/sdc" }
# - { osd: "/dev/sdd" }
# Journal variable is not mandatory.
#storage_ceph_disks:
###############################################################################
# Storage node sysctl configuration.
# Dict of sysctl parameters to set.
#storage_sysctl_parameters:
###############################################################################
# Storage node user configuration.
# List of users to create. This should be in a format accepted by the
# singleplatform-eng.users role.
#storage_users:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes