From e3468c1b270557fd1e810d90e4ee647524c88a28 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 14 Sep 2017 15:37:00 +0100 Subject: [PATCH] Synchronise configuration with master Synchronised with kayobe @ c7197f9f36af586c66235dec8333446d60c7e13d. --- etc/kayobe/controllers.yml | 19 ++++++ etc/kayobe/docker.yml | 4 ++ etc/kayobe/inspector.yml | 11 ++++ .../group_vars/controllers/network-interfaces | 6 ++ .../group_vars/seed/network-interfaces | 6 ++ etc/kayobe/inventory/groups | 7 +++ etc/kayobe/ipa.yml | 62 +++++++++++++++++-- etc/kayobe/kolla.yml | 32 ++++++++++ etc/kayobe/monitoring.yml | 16 +++++ etc/kayobe/networks.yml | 3 + etc/kayobe/seed-hypervisor.yml | 16 +++++ etc/kayobe/seed.yml | 16 +++++ etc/kayobe/users.yml | 7 +++ 13 files changed, 199 insertions(+), 6 deletions(-) create mode 100644 etc/kayobe/users.yml diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml index e7cc2f6..ed41272 100644 --- a/etc/kayobe/controllers.yml +++ b/etc/kayobe/controllers.yml @@ -9,12 +9,18 @@ ############################################################################### # Network interface attachments. +# List of networks to which controller nodes are attached. +#controller_network_interfaces: + # List of default networks to which controller nodes are attached. #controller_default_network_interfaces: # List of extra networks to which controller nodes are attached. #controller_extra_network_interfaces: +# List of network interfaces to which network nodes are attached. +#controller_network_host_network_interfaces: + ############################################################################### # Controller node BIOS configuration. @@ -80,6 +86,19 @@ # Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking. #controller_lvm_group_data_lv_docker_volumes_fs: +############################################################################### +# Controller node sysctl configuration. + +# Dict of sysctl parameters to set. +#controller_sysctl_parameters: + +############################################################################### +# Controller node user configuration. + +# List of users to create. This should be in a format accepted by the +# singleplatform-eng.users role. +#controller_users: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/docker.yml b/etc/kayobe/docker.yml index 6186b2d..abc07a7 100644 --- a/etc/kayobe/docker.yml +++ b/etc/kayobe/docker.yml @@ -2,6 +2,10 @@ ############################################################################### # Docker configuration. +# Name of the docker storage driver. Supported values include 'devicemapper' +# and 'overlay'. +#docker_storage_driver: + # Name of the docker storage LVM volume group. #docker_storage_volume_group: diff --git a/etc/kayobe/inspector.yml b/etc/kayobe/inspector.yml index 3bbb5ac..12ab7e5 100644 --- a/etc/kayobe/inspector.yml +++ b/etc/kayobe/inspector.yml @@ -109,6 +109,17 @@ # applied. #inspector_dell_switch_lldp_workaround_group: +############################################################################### +# Inspection store configuration. +# The inspection store provides a Swift-like service for storing inspection +# data which may be useful in environments without Swift. + +# Whether the inspection data store is enabled. +#inspector_store_enabled: + +# Port on which the inspection data store should listen. +#inspector_store_port: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/inventory/group_vars/controllers/network-interfaces b/etc/kayobe/inventory/group_vars/controllers/network-interfaces index eb774ee..0f4964d 100644 --- a/etc/kayobe/inventory/group_vars/controllers/network-interfaces +++ b/etc/kayobe/inventory/group_vars/controllers/network-interfaces @@ -5,26 +5,32 @@ # Overcloud provisioning network IP information. # provision_oc_net_interface: # provision_oc_net_bridge_ports: +# provision_oc_net_bond_slaves: # Workload provisioning network IP information. # provision_wl_net_interface: # provision_wl_net_bridge_ports: +# provision_wl_net_bond_slaves: # Internal network IP information. # internal_net_interface: # internal_net_bridge_ports: +# internal_net_bond_slaves: # External network IP information. # external_net_interface: # external_net_bridge_ports: +# external_net_bond_slaves: # Storage network IP information. # storage_net_interface: # storage_net_bridge_ports: +# storage_net_bond_slaves: # Storage management network IP information. # storage_mgmt_net_interface: # storage_mgmt_net_bridge_ports: +# storage_mgmt_net_bond_slaves: ############################################################################### # Dummy variable to allow Ansible to accept this file. diff --git a/etc/kayobe/inventory/group_vars/seed/network-interfaces b/etc/kayobe/inventory/group_vars/seed/network-interfaces index 628d2de..d1bde9f 100644 --- a/etc/kayobe/inventory/group_vars/seed/network-interfaces +++ b/etc/kayobe/inventory/group_vars/seed/network-interfaces @@ -5,26 +5,32 @@ # Overcloud provisioning network IP information. # provision_oc_net_interface: # provision_oc_net_bridge_ports: +# provision_oc_net_bond_slaves: # Workload provisioning network IP information. # provision_wl_net_interface: # provision_wl_net_bridge_ports: +# provision_wl_net_bond_slaves: # Internal network IP information. # internal_net_interface: # internal_net_bridge_ports: +# internal_net_bond_slaves: # External network IP information. # external_net_interface: # external_net_bridge_ports: +# external_net_bond_slaves: # Storage network IP information. # storage_net_interface: # storage_net_bridge_ports: +# storage_net_bond_slaves: # Storage management network IP information. # storage_mgmt_net_interface: # storage_mgmt_net_bridge_ports: +# storage_mgmt_net_bond_slaves: ############################################################################### # Dummy variable to allow Ansible to accept this file. diff --git a/etc/kayobe/inventory/groups b/etc/kayobe/inventory/groups index 554b68d..02c5956 100644 --- a/etc/kayobe/inventory/groups +++ b/etc/kayobe/inventory/groups @@ -7,17 +7,24 @@ [controllers] # Empty group to provide declaration of controllers group. +[network:children] +# Add controllers to network group by default for backwards compatibility, +# although they could be separate hosts. +controllers + [monitoring] # Empty group to provide declaration of monitoring group. [overcloud:children] controllers +network monitoring [docker:children] # Hosts in this group will have Docker installed. seed controllers +network monitoring ############################################################################### diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml index 4056afa..3464ef2 100644 --- a/etc/kayobe/ipa.yml +++ b/etc/kayobe/ipa.yml @@ -20,6 +20,33 @@ # to upper version constraint. #ipa_build_custom_upper_constraints: +# List of default Diskimage Builder (DIB) elements to use when building IPA +# images. +#ipa_build_dib_elements_default: + +# List of additional Diskimage Builder (DIB) elements to use when building IPA +# images. +#ipa_build_dib_elements_extra: + +# List of Diskimage Builder (DIB) elements to use when building IPA images. +#ipa_build_dib_elements: + +# Dictionary of default environment variables to provide to Diskimage Builder +# (DIB) during IPA image build. +#ipa_build_dib_env_default: + +# Dictionary of additional environment variables to provide to Diskimage +# Builder (DIB) during IPA image build. +#ipa_build_dib_env_extra: + +# Dictionary of environment variables to provide to Diskimage Builder (DIB) +# during IPA image build. +#ipa_build_dib_env: + +# List of git repositories containing Diskimage Builder (DIB) elements. See +# stackhpc.os-images role for usage. +#ipa_build_dib_git_elements: + ############################################################################### # Ironic Python Agent (IPA) images configuration. @@ -38,14 +65,37 @@ ############################################################################### # Ironic Python Agent (IPA) deployment configuration. -# List of extra kernel parameters to enable LLDP collection. -#ipa_kernel_options_collect_lldp: +# Whether to enable collection of LLDP TLVs. +#ipa_collect_lldp: -# List of extra kernel parameters to enable all inspector collectors. -#ipa_kernel_options_inspection_collectors_all: +# List of default inspection collectors to run. +# NOTE: extra-hardware is not currently included as it requires a ramdisk +# with the hardware python module installed. +#ipa_collectors_default: -# List of extra kernel parameters to enable all inspector benchmarks. -#ipa_kernel_options_inspection_benchmarks_all: +# List of additional inspection collectors to run. +#ipa_collectors_extra: + +# List of inspection collectors to run. +#ipa_collectors: + +# List of default inspection benchmarks to run. +#ipa_benchmarks_default: + +# List of extra inspection benchmarks to run. +#ipa_benchmarks_extra: + +# List of inspection benchmarks to run. +#ipa_benchmarks: + +# List of default kernel parameters for Ironic python agent. +#ipa_kernel_options_default: + +# List of additional kernel parameters for Ironic python agent. +#ipa_kernel_options_extra: + +# List of kernel parameters for Ironic python agent. +#ipa_kernel_options: ############################################################################### # Dummy variable to allow Ansible to accept this file. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index c154d22..21be075 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -63,6 +63,38 @@ # remove. The value should be a list. #kolla_build_customizations: +############################################################################### +# Kolla-ansible inventory configuration. + +# Full custom seed inventory contents. +#kolla_seed_inventory_custom: + +# Custom overcloud inventory containing a mapping from top level groups to +# hosts. +#kolla_overcloud_inventory_custom_top_level: + +# Custom overcloud inventory containing a mapping from components to top level +# groups. +#kolla_overcloud_inventory_custom_components: + +# Custom overcloud inventory containing a mapping from services to components. +#kolla_overcloud_inventory_custom_services: + +# Full custom overcloud inventory contents. By default this will be the +# concatenation of the top level, component, and service inventories. +#kolla_overcloud_inventory_custom: + +# Dict mapping from kolla-ansible groups to kayobe groups and variables. Each +# item is a dict with the following items: +# * groups: A list of kayobe ansible groups to map to this kolla-ansible group. +# * vars: A dict mapping variable names to values for hosts in this +# kolla-ansible group. +#kolla_overcloud_inventory_top_level_group_map: + +# List of names of top level kolla-ansible groups. Any of these groups which +# have no hosts mapped to them will be provided with an empty group definition. +#kolla_overcloud_inventory_kolla_top_level_groups: + ############################################################################### # Kolla-ansible configuration. diff --git a/etc/kayobe/monitoring.yml b/etc/kayobe/monitoring.yml index 0862b64..a5dabbf 100644 --- a/etc/kayobe/monitoring.yml +++ b/etc/kayobe/monitoring.yml @@ -9,6 +9,9 @@ ############################################################################### # Monitoring node network interface configuration. +# List of networks to which monitoring nodes are attached. +#monitoring_network_interfaces: + # List of default networks to which monitoring nodes are attached. #monitoring_default_network_interfaces: @@ -60,6 +63,19 @@ # role for format. #monitoring_lvm_groups_extra: +############################################################################### +# Monitoring node sysctl configuration. + +# Dict of sysctl parameters to set. +#monitoring_sysctl_parameters: + +############################################################################### +# Monitoring node user configuration. + +# List of users to create. This should be in a format accepted by the +# singleplatform-eng.users role. +#monitoring_users: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/networks.yml b/etc/kayobe/networks.yml index 4a03e63..0d43d5e 100644 --- a/etc/kayobe/networks.yml +++ b/etc/kayobe/networks.yml @@ -27,6 +27,9 @@ # to provide external network access via Neutron. #external_net_name: +# Name of the network used to expose the public OpenStack API endpoints. +#public_net_name: + # Name of the network used to carry storage data traffic. #storage_net_name: diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml index 49d06a6..968cec9 100644 --- a/etc/kayobe/seed-hypervisor.yml +++ b/etc/kayobe/seed-hypervisor.yml @@ -2,6 +2,9 @@ ############################################################################### # Seed hypervisor network interface configuration. +# List of networks to which seed hypervisor nodes are attached. +#seed_hypervisor_network_interfaces: + # List of default networks to which seed hypervisor nodes are attached. #seed_hypervisor_default_network_interfaces: @@ -41,6 +44,19 @@ # List of libvirt networks for the seed hypervisor. #seed_hypervisor_libvirt_networks: +############################################################################### +# Seed hypervisor sysctl configuration. + +# Dict of sysctl parameters to set. +#seed_hypervisor_sysctl_parameters: + +############################################################################### +# Seed hypervisor user configuration. + +# List of users to create. This should be in a format accepted by the +# singleplatform-eng.users role. +#seed_hypervisor_users: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index bd179ce..c3d9276 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -9,6 +9,9 @@ ############################################################################### # Network interface attachments. +# List of networks to which seed nodes are attached. +#seed_network_interfaces: + # List of default networks to which seed nodes are attached. #seed_default_network_interfaces: @@ -48,6 +51,19 @@ # Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking. #seed_lvm_group_data_lv_docker_volumes_fs: +############################################################################### +# Seed node sysctl configuration. + +# Dict of sysctl parameters to set. +#seed_sysctl_parameters: + +############################################################################### +# Seed node user configuration. + +# List of users to create. This should be in a format accepted by the +# singleplatform-eng.users role. +#seed_users: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/users.yml b/etc/kayobe/users.yml new file mode 100644 index 0000000..198ecc9 --- /dev/null +++ b/etc/kayobe/users.yml @@ -0,0 +1,7 @@ +--- +################################################################################ +# User configuration. + +# List of users to create. This should be in a format accepted by the +# singleplatform-eng.users role. +#users_default: