Synchronise configuration with kayobe @ 610c8a9566e73524f59cf781c09108fb90a0c3bd

This commit is contained in:
Mark Goddard 2017-11-27 14:08:31 +00:00
parent dd942ed498
commit cec52ed9d8
12 changed files with 226 additions and 6 deletions

101
etc/kayobe/compute.yml Normal file
View File

@ -0,0 +1,101 @@
---
###############################################################################
# Compute node configuration.
# User with which to access the computes via SSH during bootstrap, in order
# to setup the Kayobe user account.
#compute_bootstrap_user:
###############################################################################
# Network interface attachments.
# List of networks to which compute nodes are attached.
#compute_network_interfaces:
# List of default networks to which compute nodes are attached.
#compute_default_network_interfaces:
# List of extra networks to which compute nodes are attached.
#compute_extra_network_interfaces:
###############################################################################
# Compute node BIOS configuration.
# Dict of compute BIOS options. Format is same as that used by stackhpc.drac
# role.
#compute_bios_config:
# Dict of default compute BIOS options. Format is same as that used by
# stackhpc.drac role.
#compute_bios_config_default:
# Dict of additional compute BIOS options. Format is same as that used by
# stackhpc.drac role.
#compute_bios_config_extra:
###############################################################################
# Compute node RAID configuration.
# List of compute RAID volumes. Format is same as that used by stackhpc.drac
# role.
#compute_raid_config:
# List of default compute RAID volumes. Format is same as that used by
# stackhpc.drac role.
#compute_raid_config_default:
# List of additional compute RAID volumes. Format is same as that used by
# stackhpc.drac role.
#compute_raid_config_extra:
###############################################################################
# Compute node LVM configuration.
# List of compute volume groups. See mrlesmithjr.manage-lvm role for
# format.
#compute_lvm_groups:
# Default list of compute volume groups. See mrlesmithjr.manage-lvm role for
# format.
#compute_lvm_groups_default:
# Additional list of compute volume groups. See mrlesmithjr.manage-lvm role
# for format.
#compute_lvm_groups_extra:
# Compute LVM volume group for data. See mrlesmithjr.manage-lvm role for
# format.
#compute_lvm_group_data:
# List of disks for use by compute LVM data volume group. Default to an
# invalid value to require configuration.
#compute_lvm_group_data_disks:
# List of LVM logical volumes for the data volume group.
#compute_lvm_group_data_lvs:
# Docker volumes LVM backing volume.
#compute_lvm_group_data_lv_docker_volumes:
# Size of docker volumes LVM backing volume.
#compute_lvm_group_data_lv_docker_volumes_size:
# Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking.
#compute_lvm_group_data_lv_docker_volumes_fs:
###############################################################################
# Compute node sysctl configuration.
# Dict of sysctl parameters to set.
#compute_sysctl_parameters:
###############################################################################
# Compute node user configuration.
# List of users to create. This should be in a format accepted by the
# singleplatform-eng.users role.
#compute_users:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

View File

@ -22,6 +22,12 @@
# argument). # argument).
#docker_storage_volume_thinpool_meta_size: #docker_storage_volume_thinpool_meta_size:
# URL of docker registry
#docker_registry:
# CA of docker registry
#docker_registry_ca:
############################################################################### ###############################################################################
# Dummy variable to allow Ansible to accept this file. # Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes workaround_ansible_issue_8743: yes

View File

@ -1,9 +1,22 @@
# Kayobe groups inventory file. This file should generally not be modified. # Kayobe groups inventory file. This file should generally not be modified.
# If declares the top-level groups and sub-groups. # If declares the top-level groups and sub-groups.
###############################################################################
# Seed groups.
[seed] [seed]
# Empty group to provide declaration of seed group. # Empty group to provide declaration of seed group.
[seed-hypervisor]
# Empty group to provide declaration of seed-hypervisor group.
[container-image-builders:children]
# Build container images on the seed by default.
seed
###############################################################################
# Overcloud groups.
[controllers] [controllers]
# Empty group to provide declaration of controllers group. # Empty group to provide declaration of controllers group.
@ -15,10 +28,17 @@ controllers
[monitoring] [monitoring]
# Empty group to provide declaration of monitoring group. # Empty group to provide declaration of monitoring group.
[compute]
# Empty group to provide declaration of compute group.
[overcloud:children] [overcloud:children]
controllers controllers
network network
monitoring monitoring
compute
###############################################################################
# Docker groups.
[docker:children] [docker:children]
# Hosts in this group will have Docker installed. # Hosts in this group will have Docker installed.
@ -26,6 +46,13 @@ seed
controllers controllers
network network
monitoring monitoring
compute
###############################################################################
# Baremetal compute node groups.
[baremetal-compute]
# Empty group to provide declaration of baremetal-compute group.
############################################################################### ###############################################################################
# Networking groups. # Networking groups.

View File

@ -18,6 +18,9 @@ localhost ansible_connection=local
# Add controller nodes here if required. These hosts will provide the # Add controller nodes here if required. These hosts will provide the
# OpenStack overcloud. # OpenStack overcloud.
[baremetal-compute]
# Add baremetal compute nodes here if required.
[mgmt-switches] [mgmt-switches]
# Add management network switches here if required. # Add management network switches here if required.

View File

@ -20,6 +20,9 @@
# Path to virtualenv in which to install kolla. # Path to virtualenv in which to install kolla.
#kolla_venv: #kolla_venv:
# Path in which to generate kolla configuration.
#kolla_build_config_path:
############################################################################### ###############################################################################
# Kolla-ansible installation. # Kolla-ansible installation.
@ -39,24 +42,33 @@
# Path to virtualenv in which to install kolla-ansible. # Path to virtualenv in which to install kolla-ansible.
#kolla_ansible_venv: #kolla_ansible_venv:
############################################################################### # Path to Kolla-ansible configuration directory.
# Kolla & kolla-ansible configuration.
# Path to Kolla configuration directory.
#kolla_config_path: #kolla_config_path:
# Path to Kolla node custom configuration directory. # Path to Kolla-ansible node custom configuration directory.
#kolla_node_custom_config_path: #kolla_node_custom_config_path:
###############################################################################
# Kolla configuration.
# Kolla base container image distribution. # Kolla base container image distribution.
#kolla_base_distro: #kolla_base_distro:
# Kolla installation type: binary or source. # Kolla installation type: binary or source.
#kolla_install_type: #kolla_install_type:
# URL of docker registry to use for Kolla images.
#kolla_docker_registry:
# Docker namespace to use for Kolla images. # Docker namespace to use for Kolla images.
#kolla_docker_namespace: #kolla_docker_namespace:
# Username to use to access a docker registry.
#kolla_docker_registry_username:
# Password to use to access a docker registry.
#kolla_docker_registry_password:
# Kolla OpenStack release version. This should be a Docker image tag. # Kolla OpenStack release version. This should be a Docker image tag.
#kolla_openstack_release: #kolla_openstack_release:

View File

@ -150,6 +150,13 @@
# OVS bridge. # OVS bridge.
#network_patch_suffix_ovs: #network_patch_suffix_ovs:
###############################################################################
# Network routing table configuration.
# List of IP routing tables. Each item should be a dict containing 'id' and
# 'name' items. These tables will be added to /etc/iproute2/rt_tables.
#network_route_tables:
############################################################################### ###############################################################################
# Dummy variable to allow Ansible to accept this file. # Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes workaround_ansible_issue_8743: yes

View File

@ -2,7 +2,8 @@
############################################################################### ###############################################################################
# Neutron configuration. # Neutron configuration.
# List of Neutron ML2 mechanism drivers to use. # List of Neutron ML2 mechanism drivers to use. If unset the kolla-ansible
# defaults will be used.
#kolla_neutron_ml2_mechanism_drivers: #kolla_neutron_ml2_mechanism_drivers:
# List of Neutron ML2 type drivers to use. # List of Neutron ML2 type drivers to use.
@ -21,6 +22,9 @@
# List of Neutron ML2 extention drivers to use. # List of Neutron ML2 extention drivers to use.
#kolla_neutron_ml2_extension_drivers: #kolla_neutron_ml2_extension_drivers:
###############################################################################
# Neutron ML2 generic switch driver configuration.
# List of switches to configure for use by genericswitch ML2 mechanism driver. # List of switches to configure for use by genericswitch ML2 mechanism driver.
# Each item should be a dict containing the following items: # Each item should be a dict containing the following items:
# name: Hostname of the switch # name: Hostname of the switch
@ -43,6 +47,12 @@
# secret: not currently supported # secret: not currently supported
#kolla_neutron_ml2_generic_switch_hosts: #kolla_neutron_ml2_generic_switch_hosts:
# Dict containing additional configuration for switches managed by the
# genericswitch ML2 mechanism driver. For per-switch configuration of switches
# in kolla_neutron_ml2_generic_switch_hosts, this may be set as a group or
# host variable for the switch host.
#kolla_neutron_ml2_generic_switch_extra:
############################################################################### ###############################################################################
# Dummy variable to allow Ansible to accept this file. # Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes workaround_ansible_issue_8743: yes

View File

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

12
etc/kayobe/nova.yml Normal file
View File

@ -0,0 +1,12 @@
---
###############################################################################
# Nova configuration.
# Which host to use to deploy the nova-compute services for ironic. By default
# this is none and all hosts in the nova group are used instead - typically the
# controllers.
#kolla_nova_compute_ironic_host:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

View File

@ -26,6 +26,12 @@
# Base image for the seed VM root volume. # Base image for the seed VM root volume.
#seed_vm_root_image: #seed_vm_root_image:
# Capacity of the seed VM data volume.
#seed_vm_data_capacity:
# Format of the seed VM data volume.
#seed_vm_data_format:
############################################################################### ###############################################################################
# Dummy variable to allow Ansible to accept this file. # Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes workaround_ansible_issue_8743: yes

10
etc/kayobe/yum-cron.yml Normal file
View File

@ -0,0 +1,10 @@
---
# Whether to enable Yum automatic updates.
#yum_cron_enabled: false
# Command to use for Yum automatic updates.
#yum_cron_update_cmd: 'security'
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

16
etc/kayobe/yum.yml Normal file
View File

@ -0,0 +1,16 @@
---
# Whether or not to use a local Yum mirror.
#yum_use_local_mirror: false
# Mirror FQDN for Yum repos.
#yum_centos_mirror_host: 'mirror.centos.org'
# Mirror directory for Yum CentOS repos.
#yum_centos_mirror_directory: 'centos'
# Mirror FQDN for Yum EPEL repos.
#yum_epel_mirror_host: 'download.fedoraproject.org'
# Mirror directory for Yum EPEL repos.
#yum_epel_mirror_directory: 'pub/epel'
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes