Synchronise configuration with kayobe 1.0.0

This commit is contained in:
Mark Goddard 2017-06-29 13:30:42 +01:00
parent f7967972c5
commit e7ea2d5e4c
9 changed files with 151 additions and 7 deletions

View File

@ -0,0 +1,13 @@
---
###############################################################################
# Docker registry configuration.
# Whether a docker registry is enabled.
#docker_registry_enabled:
# The port on which the docker registry server should listen.
#docker_registry_port:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

View File

@ -45,9 +45,13 @@
# Ironic inspector IPMI password to set. # Ironic inspector IPMI password to set.
#inspector_ipmi_password: #inspector_ipmi_password:
# Ironic inspector network interface name on which to check for an LLDP switch # Ironic inspector default network interface name on which to check for an LLDP
# port description to use as the node's name. # switch port description to use as the node's name.
#inspector_lldp_switch_port_interface: #inspector_lldp_switch_port_interface_default:
# Ironic inspector map from hostname to network interface name on which to
# check for an LLDP switch port description to use as the node's name.
#inspector_lldp_switch_port_interface_map:
############################################################################### ###############################################################################
# Ironic inspector introspection rules configuration. # Ironic inspector introspection rules configuration.

View File

@ -7,10 +7,18 @@
[controllers] [controllers]
# Empty group to provide declaration of controllers group. # Empty group to provide declaration of controllers group.
[monitoring]
# Empty group to provide declaration of monitoring group.
[overcloud:children]
controllers
monitoring
[docker:children] [docker:children]
# Hosts in this group will have Docker installed. # Hosts in this group will have Docker installed.
seed seed
controllers controllers
monitoring
############################################################################### ###############################################################################
# Networking groups. # Networking groups.

View File

@ -1,6 +1,25 @@
--- ---
# Ironic Python Agent (IPA) configuration. # Ironic Python Agent (IPA) configuration.
###############################################################################
# Ironic Python Agent (IPA) image build configuration.
# Whether to build IPA images from source.
#ipa_build_images:
# URL of IPA source repository.
#ipa_build_source_url:
# Version of IPA source repository.
#ipa_build_source_version:
# URL of IPA upper constraints file.
#ipa_build_upper_constraints_file_url:
# Custom python package version constraints for IPA. Dict mapping package name
# to upper version constraint.
#ipa_build_custom_upper_constraints:
############################################################################### ###############################################################################
# Ironic Python Agent (IPA) images configuration. # Ironic Python Agent (IPA) images configuration.
@ -8,13 +27,13 @@
#ipa_images_kernel_name: #ipa_images_kernel_name:
# URL of Ironic deployment kernel image to download. # URL of Ironic deployment kernel image to download.
#ipa_images_kernel_url: #ipa_kernel_upstream_url:
# Name of Ironic deployment ramdisk image to register in Glance. # Name of Ironic deployment ramdisk image to register in Glance.
#ipa_images_ramdisk_name: #ipa_images_ramdisk_name:
# URL of Ironic deployment ramdisk image to download. # URL of Ironic deployment ramdisk image to download.
#ipa_images_ramdisk_url: #ipa_ramdisk_upstream_url:
############################################################################### ###############################################################################
# Ironic Python Agent (IPA) deployment configuration. # Ironic Python Agent (IPA) deployment configuration.

View File

@ -55,6 +55,14 @@
# Dict mapping Jinja2 block names in kolla's Docker images to their contents. # Dict mapping Jinja2 block names in kolla's Docker images to their contents.
#kolla_build_blocks: #kolla_build_blocks:
# Dict mapping image customization variable names to their values.
# Each variable takes the form:
# <image name>_<customization>_<operation>
# Hyphens in the image name are replaced with underscores. The customization is
# most commonly packages. The operation should be one of override, append or
# remove. The value should be a list.
#kolla_build_customizations:
############################################################################### ###############################################################################
# Kolla-ansible configuration. # Kolla-ansible configuration.

65
etc/kayobe/monitoring.yml Normal file
View File

@ -0,0 +1,65 @@
---
###############################################################################
# Monitoring node configuration.
# User with which to access the monitoring nodes via SSH during bootstrap, in
# order to setup the Kayobe user account.
#monitoring_bootstrap_user:
###############################################################################
# Monitoring node network interface configuration.
# List of default networks to which monitoring nodes are attached.
#monitoring_default_network_interfaces:
# List of extra networks to which monitoring nodes are attached.
#monitoring_extra_network_interfaces:
###############################################################################
# Monitoring node BIOS configuration.
# Dict of monitoring node BIOS options. Format is same as that used by
# stackhpc.drac role.
#monitoring_bios_config:
# Dict of default monitoring node BIOS options. Format is same as that used by
# stackhpc.drac role.
#monitoring_bios_config_default:
# Dict of additional monitoring node BIOS options. Format is same as that used
# by stackhpc.drac role.
#monitoring_bios_config_extra:
###############################################################################
# Monitoring node RAID configuration.
# List of monitoring node RAID volumes. Format is same as that used by
# stackhpc.drac role.
#monitoring_raid_config:
# List of default monitoring node RAID volumes. Format is same as that used by
# stackhpc.drac role.
#monitoring_raid_config_default:
# List of additional monitoring node RAID volumes. Format is same as that used
# by stackhpc.drac role.
#monitoring_raid_config_extra:
###############################################################################
# Monitoring node LVM configuration.
# List of monitoring node volume groups. See mrlesmithjr.manage-lvm role for
# format.
#monitoring_lvm_groups:
# Default list of monitoring node volume groups. See mrlesmithjr.manage-lvm
# role for format.
#monitoring_lvm_groups_default:
# Additional list of monitoring node volume groups. See mrlesmithjr.manage-lvm
# role for format.
#monitoring_lvm_groups_extra:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

View File

@ -14,10 +14,13 @@
# List of Neutron ML2 network VLAN ranges to use. Each item should be a dict # List of Neutron ML2 network VLAN ranges to use. Each item should be a dict
# containing the following items: # containing the following items:
# physical_network: The physical network # physical_network: The physical network
# min: Minimum of allowed VLAN range (optional) # range: Range of allowed VLANs on this physical network (format <min>:<max>,
# max: Maximum of allowed VLAN range (optional) # optional)
#kolla_neutron_ml2_network_vlan_ranges: #kolla_neutron_ml2_network_vlan_ranges:
# List of Neutron ML2 extention drivers to use.
#kolla_neutron_ml2_extension_drivers:
# 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

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

@ -0,0 +1,10 @@
---
###############################################################################
# OpenSM Infiniband subnet manager configuration.
# Whether OpenSM is enabled.
#opensm_enabled:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

14
etc/kayobe/overcloud.yml Normal file
View File

@ -0,0 +1,14 @@
---
###############################################################################
# Overcloud configuration.
# Default Ansible group for overcloud hosts.
#overcloud_group_default:
# List of names of Ansible groups for overcloud hosts.
#overcloud_groups:
# Dict mapping overcloud Ansible group names to lists of hosts in the group.
# As a special case, the group 'ignore' can be used to specify hosts that
# should not be added to the inventory.
#overcloud_group_hosts_map: