From 6e4642a2001f1c8d99f134256d8ed6f188be818a Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 10 Oct 2018 09:47:20 +0100 Subject: [PATCH] Synchronise with kayobe-config for Queens Synchronise configuration format with kayobe-config @ 371937fa9053d77a4bbca88d830d60dc76628c62. Change-Id: Ife6e3f251120edcf5f94ca677a51bd5fe21fdc6f --- etc/kayobe/bifrost.yml | 21 ++++++++++ etc/kayobe/dns.yml | 3 ++ etc/kayobe/globals.yml | 4 +- etc/kayobe/inspector.yml | 12 ++++++ .../group_vars/compute/network-interfaces | 27 +++++++++++++ etc/kayobe/inventory/groups | 5 +++ etc/kayobe/inventory/hosts | 18 +++++++++ etc/kayobe/ipa.yml | 12 ++++++ etc/kayobe/kolla.yml | 38 +++++++++++++++++-- etc/kayobe/networks.yml | 13 +++++++ etc/kayobe/overcloud.yml | 8 ++++ etc/kayobe/pip.yml | 23 +++++++++++ etc/kayobe/ssh.yml | 4 +- etc/kayobe/yum.yml | 6 +++ 14 files changed, 186 insertions(+), 8 deletions(-) create mode 100644 etc/kayobe/inventory/group_vars/compute/network-interfaces create mode 100644 etc/kayobe/pip.yml diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml index 9c590bc..ceffb27 100644 --- a/etc/kayobe/bifrost.yml +++ b/etc/kayobe/bifrost.yml @@ -69,6 +69,27 @@ # Ironic inspector deployment ramdisk location. #kolla_bifrost_inspector_deploy_ramdisk: +############################################################################### +# Ironic Python Agent (IPA) configuration. + +# URL of Ironic Python Agent (IPA) kernel image. +#kolla_bifrost_ipa_kernel_upstream_url: + +# URL of checksum of Ironic Python Agent (IPA) kernel image. +#kolla_bifrost_ipa_kernel_checksum_url: + +# Algorithm of checksum of Ironic Python Agent (IPA) kernel image. +#kolla_bifrost_ipa_kernel_checksum_algorithm: + +# URL of Ironic Python Agent (IPA) ramdisk image. +#kolla_bifrost_ipa_ramdisk_upstream_url: + +# URL of checksum of Ironic Python Agent (IPA) ramdisk image. +#kolla_bifrost_ipa_ramdisk_checksum_url: + +# Algorithm of checksum of Ironic Python Agent (IPA) ramdisk image. +#kolla_bifrost_ipa_ramdisk_checksum_algorithm: + ############################################################################### # Inventory configuration. diff --git a/etc/kayobe/dns.yml b/etc/kayobe/dns.yml index 46c48fb..2b91aa9 100644 --- a/etc/kayobe/dns.yml +++ b/etc/kayobe/dns.yml @@ -2,6 +2,9 @@ ############################################################################### # DNS. +# Whether kayobe should configure resolv.conf. +#resolv_is_managed: + # List of DNS nameservers. #resolv_nameservers: diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml index 5f3edc7..f3bbb77 100644 --- a/etc/kayobe/globals.yml +++ b/etc/kayobe/globals.yml @@ -2,9 +2,9 @@ # Kayobe global configuration. ############################################################################### -# Local path configuration (ansible control host). +# Local path configuration (Ansible control host). -# Path to Kayobe configuration directory on ansible control host. +# Path to Kayobe configuration directory on Ansible control host. #kayobe_config_path: ############################################################################### diff --git a/etc/kayobe/inspector.yml b/etc/kayobe/inspector.yml index dc41218..ac83dd3 100644 --- a/etc/kayobe/inspector.yml +++ b/etc/kayobe/inspector.yml @@ -8,9 +8,21 @@ # URL of Ironic Python Agent (IPA) kernel image. #inspector_ipa_kernel_upstream_url: +# URL of checksum of Ironic Python Agent (IPA) kernel image. +#inspector_ipa_kernel_checksum_url: + +# Algorithm of checksum of Ironic Python Agent (IPA) kernel image. +#inspector_ipa_kernel_checksum_algorithm: + # URL of Ironic Python Agent (IPA) ramdisk image. #inspector_ipa_ramdisk_upstream_url: +# URL of checksum of Ironic Python Agent (IPA) ramdisk image. +#inspector_ipa_ramdisk_checksum_url: + +# Algorithm of checksum of Ironic Python Agent (IPA) ramdisk image. +#inspector_ipa_ramdisk_checksum_algorithm: + ############################################################################### # Ironic inspector processing configuration. diff --git a/etc/kayobe/inventory/group_vars/compute/network-interfaces b/etc/kayobe/inventory/group_vars/compute/network-interfaces new file mode 100644 index 0000000..421f69d --- /dev/null +++ b/etc/kayobe/inventory/group_vars/compute/network-interfaces @@ -0,0 +1,27 @@ +--- +############################################################################### +# Network interface definitions for the compute group. + +# Overcloud provisioning network IP information. +# provision_oc_net_interface: +# provision_oc_net_bridge_ports: +# provision_oc_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: + +############################################################################### +# Dummy variable to allow Ansible to accept this file. +workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/inventory/groups b/etc/kayobe/inventory/groups index e505054..cb9c906 100644 --- a/etc/kayobe/inventory/groups +++ b/etc/kayobe/inventory/groups @@ -28,6 +28,9 @@ controllers [monitoring] # Empty group to provide declaration of monitoring group. +[storage] +# Empty group to provide declaration of storage group. + [compute] # Empty group to provide declaration of compute group. @@ -35,6 +38,7 @@ controllers controllers network monitoring +storage compute ############################################################################### @@ -46,6 +50,7 @@ seed controllers network monitoring +storage compute ############################################################################### diff --git a/etc/kayobe/inventory/hosts b/etc/kayobe/inventory/hosts index bda5455..b577629 100644 --- a/etc/kayobe/inventory/hosts +++ b/etc/kayobe/inventory/hosts @@ -1,5 +1,11 @@ +# This host acts as the configuration management Ansible control host. This must be +# localhost. localhost ansible_connection=local +[seed-hypervisor] +# Add a seed hypervisor node here if required. This host will run a seed node +# Virtual Machine. + [seed] seed @@ -8,3 +14,15 @@ controller0 [compute:children] controllers + +[baremetal-compute] +# Add baremetal compute nodes here if required. + +[mgmt-switches] +# Add management network switches here if required. + +[ctl-switches] +# Add control and provisioning switches here if required. + +[hs-switches] +# Add high speed switches here if required. diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml index 3464ef2..828a8ab 100644 --- a/etc/kayobe/ipa.yml +++ b/etc/kayobe/ipa.yml @@ -56,12 +56,24 @@ # URL of Ironic deployment kernel image to download. #ipa_kernel_upstream_url: +# URL of checksum of Ironic deployment kernel image. +#ipa_kernel_checksum_url: + +# Algorithm of checksum of Ironic deployment kernel image. +#ipa_kernel_checksum_algorithm: + # Name of Ironic deployment ramdisk image to register in Glance. #ipa_images_ramdisk_name: # URL of Ironic deployment ramdisk image to download. #ipa_ramdisk_upstream_url: +# URL of checksum of Ironic deployment ramdisk image. +#ipa_ramdisk_checksum_url: + +# Algorithm of checksum of Ironic deployment ramdisk image. +#ipa_ramdisk_checksum_algorithm: + ############################################################################### # Ironic Python Agent (IPA) deployment configuration. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 568e71c..1a3e29e 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -42,6 +42,9 @@ # Path to virtualenv in which to install kolla-ansible. #kolla_ansible_venv: +# Extra requirements to install inside the kolla-ansible virtualenv. +#kolla_ansible_venv_extra_requirements: + # Path to Kolla-ansible configuration directory. #kolla_config_path: @@ -141,15 +144,31 @@ # Whether debug logging is enabled. #kolla_openstack_logging_debug: +# Upper constraints file for installation of Kolla. +#kolla_upper_constraints_file: + +# User account to use for Kolla SSH access. +#kolla_ansible_user: + +# Primary group of Kolla SSH user. +#kolla_ansible_group: + +# Whether to use privilege escalation for all operations performed via Kolla +# Ansible. +#kolla_ansible_become: + ############################################################################### # Kolla feature flag configuration. #kolla_enable_aodh: #kolla_enable_barbican: +#kolla_enable_blazar: #kolla_enable_cadf_notifications: #kolla_enable_ceilometer: #kolla_enable_central_logging: #kolla_enable_ceph: +#kolla_enable_ceph_mds: +#kolla_enable_ceph_nfs: #kolla_enable_ceph_rgw: #kolla_enable_cinder: #kolla_enable_cinder_backend_hnas_iscsi: @@ -157,10 +176,12 @@ #kolla_enable_cinder_backend_iscsi: #kolla_enable_cinder_backend_lvm: #kolla_enable_cinder_backend_nfs: +#kolla_enable_cinder_backend_zfssa_iscsi: #kolla_enable_cloudkitty: #kolla_enable_congress: #kolla_enable_designate: #kolla_enable_etcd: +#kolla_enable_fluentd: #kolla_enable_freezer: #kolla_enable_gnocchi: #kolla_enable_grafana: @@ -169,6 +190,8 @@ #kolla_enable_horizon: #kolla_enable_influxdb: #kolla_enable_ironic: +#kolla_enable_ironic_ipxe: +#kolla_enable_ironic_pxe_uefi: #kolla_enable_iscsid: #kolla_enable_karbor: #kolla_enable_kuryr: @@ -176,34 +199,41 @@ #kolla_enable_manila: #kolla_enable_manila_backend_generic: #kolla_enable_manila_backend_hnas: +#kolla_enable_manila_backend_cephfs_native: +#kolla_enable_manila_backend_cephfs_nfs: #kolla_enable_mistral: #kolla_enable_monasca: #kolla_enable_mongodb: #kolla_enable_multipathd: #kolla_enable_murano: -#kolla_enable_neutron_vpnaas: +#kolla_enable_neutron_agent_ha: +#kolla_enable_neutron_bgp_dragent: #kolla_enable_neutron_dvr: #kolla_enable_neutron_fwaas: #kolla_enable_neutron_lbaas: -#kolla_enable_neutron_qos: -#kolla_enable_neutron_agent_ha: -#kolla_enable_neutron_bgp_dragent: #kolla_enable_neutron_provider_networks: +#kolla_enable_neutron_qos: +#kolla_enable_neutron_segments: +#kolla_enable_neutron_sriov: +#kolla_enable_neutron_vpnaas: #kolla_enable_nova_serialconsole_proxy: #kolla_enable_octavia: #kolla_enable_osprofiler: #kolla_enable_panko: +#kolla_enable_qdrouterd: #kolla_enable_rally: #kolla_enable_sahara: #kolla_enable_searchlight: #kolla_enable_senlin: #kolla_enable_skydive: #kolla_enable_solum: +#kolla_enable_storm: #kolla_enable_swift: #kolla_enable_tacker: #kolla_enable_telegraf: #kolla_enable_tempest: #kolla_enable_trove: +#kolla_enable_vitrage: #kolla_enable_vmtp: #kolla_enable_watcher: #kolla_enable_zun: diff --git a/etc/kayobe/networks.yml b/etc/kayobe/networks.yml index 13835ee..7a7b6c9 100644 --- a/etc/kayobe/networks.yml +++ b/etc/kayobe/networks.yml @@ -6,6 +6,10 @@ # Map all networks to the all-in-one network. +# Name of the network used for admin access to the overcloud +#admin_oc_net_name: +admin_oc_net_name: aio + # Name of the network used by the seed to manage the bare metal overcloud # hosts via their out-of-band management controllers. #oob_oc_net_name: @@ -43,6 +47,10 @@ external_net_names: #public_net_name: public_net_name: aio +# Name of the network used by Neutron to carry tenant overlay network traffic. +#tunnel_net_name: +tunnel_net_name: aio + # Name of the network used to carry storage data traffic. #storage_net_name: storage_net_name: aio @@ -56,6 +64,11 @@ storage_mgmt_net_name: aio #inspection_net_name: inspection_net_name: aio +# Name of the network used to perform cleaning on the bare metal workload +# hosts +#cleaning_net_name: +cleaning_net_name: aio + ############################################################################### # Network definitions. diff --git a/etc/kayobe/overcloud.yml b/etc/kayobe/overcloud.yml index 5c4828a..0764600 100644 --- a/etc/kayobe/overcloud.yml +++ b/etc/kayobe/overcloud.yml @@ -28,6 +28,14 @@ # https://bugs.centos.org/view.php?id=14369. #overcloud_host_image_workaround_resolv_enabled: +# Workaround a CentOS 7.5 bug: cloud-init 0.7.9-24 does not correctly set +# an IP address for VLAN subinterfaces configured with the Openstack metadata +# format/Config drive. # See, https://bugs.centos.org/view.php?id=14964. +#overcloud_host_image_workaround_cloud_init_enabled: + +# cloud-init repository for overcloud_host_image_workaround_cloud_init_enabled +#overcloud_host_image_workaround_cloud_init_repo: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/pip.yml b/etc/kayobe/pip.yml new file mode 100644 index 0000000..29a84f0 --- /dev/null +++ b/etc/kayobe/pip.yml @@ -0,0 +1,23 @@ +--- + +# Use a local PyPi mirror for installing Pip packages +#pip_local_mirror: false + +# Users for which the necessary configuration will be put in place in order to +# install PyPI packages from a mirror +# NB: The Kolla user will be automatically added to this list if the above is +# set to true +#pip_applicable_users: +# - "{{ kayobe_ansible_user }}" +# - root + +# PyPI local package mirror URL +#pip_index_url: "" + +# Optional: a list of 'trusted' hosts for which SSL verification will be +# disabled +#pip_trusted_hosts: [] + +############################################################################### +# Dummy variable to allow Ansible to accept this file. +workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/ssh.yml b/etc/kayobe/ssh.yml index fe3713b..1463a4b 100644 --- a/etc/kayobe/ssh.yml +++ b/etc/kayobe/ssh.yml @@ -5,10 +5,10 @@ # Name of SSH key. #ssh_key_name: -# Path to SSH private key on the control host. +# Path to SSH private key on the Ansible control host. #ssh_private_key_path: -# Path to SSH public key on the control host. +# Path to SSH public key on the Ansible control host. #ssh_public_key_path: ############################################################################### diff --git a/etc/kayobe/yum.yml b/etc/kayobe/yum.yml index 66832d3..2bc3201 100644 --- a/etc/kayobe/yum.yml +++ b/etc/kayobe/yum.yml @@ -2,8 +2,10 @@ # 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. @@ -22,6 +24,10 @@ # gpgcheck: yes #yum_custom_repos: +# Whether to install the epel-release package. This affects RedHat-based +# systems only. +#yum_install_epel: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes