From db360ad37fc7594a2587cf51f4e5757e1aaa40d7 Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Wed, 14 Jun 2017 16:54:32 +1000 Subject: [PATCH] Cleanup config.yaml Change-Id: Idec9912d4be392283407a7e823e430bfa9c25f33 Signed-off-by: Daniel Axtens --- config.yaml | 216 +++++++++++++++++++++++++--------------------------- 1 file changed, 104 insertions(+), 112 deletions(-) diff --git a/config.yaml b/config.yaml index 5959a088..c7fd774e 100644 --- a/config.yaml +++ b/config.yaml @@ -1,11 +1,11 @@ options: debug: - default: False type: boolean + default: False description: Enable debug logging. verbose: - default: False type: boolean + default: False description: Enable verbose logging. use-syslog: type: boolean @@ -13,46 +13,38 @@ options: description: | Setting this to True will allow supporting services to log to syslog. openstack-origin: - default: distro type: string + default: distro description: | - Repository from which to install. May be one of the following: + Repository from which to install. May be one of the following: distro (default), ppa:somecustom/ppa, a deb url sources entry, - or a supported Cloud Archive release pocket. - - Supported Cloud Archive sources include: - + or a supported Ubuntu Cloud Archive, e.g. + . cloud:- cloud:-/updates cloud:-/staging cloud:-/proposed - - For series=Precise we support cloud archives for openstack-release: - * icehouse - - For series=Trusty we support cloud archives for openstack-release: - * juno - * kilo - * liberty - * mitaka - * newton - + . + See https://wiki.ubuntu.com/OpenStack/CloudArchive for info on which + cloud archives are available and supported. + . NOTE: updating this setting to a source that is known to provide - a later version of OpenStack will trigger a software upgrade. + a later version of OpenStack will trigger a software upgrade unless + action-managed-upgrade is set to True. openstack-origin-git: - default: type: string + default: description: | Specifies a default OpenStack release name, or a YAML dictionary listing the git repositories to install from. - + . The default Openstack release name may be one of the following, where the corresponding OpenStack github branch will be used: * liberty * mitaka * newton * master - + . The YAML must minimally include requirements, neutron-fwaas, neutron-lbaas, neutron-vpnaas, and neutron repositories, and may also include repositories for other dependencies: @@ -73,25 +65,57 @@ options: repository: 'git://github.com/openstack/neutron', branch: master} release: master - plugin: - default: ovs + action-managed-upgrade: + type: boolean + default: False + description: | + If True enables openstack upgrades for this charm via juju actions. + You will still need to set openstack-origin to the new repository but + instead of an upgrade running automatically across all units, it will + wait for you to execute the openstack-upgrade action for this charm on + each unit. If False it will revert to existing behavior of upgrading + all units on config change. + harden: type: string + default: + description: | + Apply system hardening. Supports a space-delimited list of modules + to run. Supported modules currently include os, ssh, apache and mysql. + rabbit-user: + type: string + description: RabbitMQ user + default: neutron + rabbit-vhost: + type: string + description: RabbitMQ Virtual Host + default: openstack + nova-rabbit-user: + type: string + description: RabbitMQ Nova user + default: nova + nova-rabbit-vhost: + type: string + description: RabbitMQ Nova Virtual Host + default: openstack + plugin: + type: string + default: ovs description: | Network configuration plugin to use for quantum. Supported values include: - - ovs - ML2 + Open vSwitch - nsx - VMware NSX - n1kv - Cisco N1kv - ovs-odl - ML2 + Open vSwitch with OpenDayLight Controller + . + ovs - ML2 + Open vSwitch + nsx - VMware NSX + n1kv - Cisco N1kv + ovs-odl - ML2 + Open vSwitch with OpenDayLight Controller ext-port: type: string default: description: | - Deprecated: Use bridge-mappings and data-port to create a network - which can be used for external connectivity. You can call the network + [DEPRECATED] Use bridge-mappings and data-port to create a network + which can be used for external connectivity. You can call the network external and the bridge br-ex by convention, but neither is required. - + . Space-delimited list of external ports to use for routing of instance traffic to the external public network. Valid values are either MAC addresses (in which case only MAC addresses for interfaces without an IP @@ -128,28 +152,12 @@ options: Optional configuration to set the external-network-id. Only needed when configuring multiple external networks and should be used in conjunction with run-internal-router. - rabbit-user: - type: string - description: RabbitMQ user - default: neutron - rabbit-vhost: - type: string - description: RabbitMQ Virtual Host - default: openstack - nova-rabbit-user: - type: string - description: RabbitMQ Nova user - default: nova - nova-rabbit-vhost: - type: string - description: RabbitMQ Nova Virtual Host - default: openstack instance-mtu: type: int default: description: | Configure DHCP services to provide MTU configuration to instances - within the cloud. This is useful in deployments where its not + within the cloud. This is useful in deployments where its not possible to increase MTU on switches and physical servers to accommodate the packet overhead of using GRE tunnels. dnsmasq-flags: @@ -164,22 +172,15 @@ options: description: | Optional configuration to support use of linux router Note that this is used only for Cisco n1kv plugin. - nagios_context: - default: "juju" - type: string + worker-multiplier: + type: float + default: description: | - Used by the nrpe-external-master subordinate charm. - A string that will be prepended to instance name to set the host name - in Nagios. So for instance the hostname would be something like: - juju-myservice-0 - If you're running multiple environments with the same services in them - this allows you to differentiate between them. - nagios_servicegroups: - default: "" - type: string - description: | - A comma-separated list of Nagios servicegroups. - If left empty, the nagios_context will be used as the servicegroup + The CPU core multiplier to use when configuring worker processes for + this service. By default, the number of workers for each daemon is + set to twice the number of CPU cores a service unit has. When deployed + in a LXD container, this default value will be capped to 4 workers + unless this configuration option is set. bridge-mappings: type: string default: 'physnet1:br-data' @@ -199,23 +200,39 @@ options: specifying physical_network names usable for VLAN provider and tenant networks, as well as ranges of VLAN tags on each available for allocation to tenant networks. - # Network configuration options - # by default all access is over 'private-address' - os-data-network: + aa-profile-mode: type: string - default: + default: 'disable' description: | - The IP address and netmask of the OpenStack Data network (e.g., - 192.168.0.0/24) - - This network will be used for tenant network traffic in overlay - networks. + Experimental enable apparmor profile. Valid settings: 'complain', + 'enforce' or 'disable'. AA disabled by default. + enable-metadata-network: + type: boolean + default: False + description: | + The metadata network is used by solutions which do not leverage the l3 + agent for providing access to the metadata service. + enable-isolated-metadata: + type: boolean + default: False + description: | + Enable metadata on an isolated network (no router ports). sysctl: type: string default: description: | YAML-formatted associative array of sysctl key/value pairs to be set persistently e.g. '{ kernel.pid_max : 4194303 }'. + # Network config (by default all access is over 'private-address') + os-data-network: + type: string + default: + description: | + The IP address and netmask of the OpenStack Data network (e.g. + 192.168.0.0/24) + . + This network will be used for tenant network traffic in overlay + networks. # Legacy (Icehouse) HA ha-legacy-mode: type: boolean @@ -239,45 +256,20 @@ options: description: | Default multicast port number that will be used to communicate between HA Cluster nodes. - action-managed-upgrade: - type: boolean - default: False - description: | - If True enables openstack upgrades for this charm via juju actions. - You will still need to set openstack-origin to the new repository but - instead of an upgrade running automatically across all units, it will - wait for you to execute the openstack-upgrade action for this charm on - each unit. If False it will revert to existing behavior of upgrading - all units on config change. - harden: - default: + # Monitoring config + nagios_context: type: string + default: "juju" description: | - Apply system hardening. Supports a space-delimited list of modules - to run. Supported modules currently include os, ssh, apache and mysql. - worker-multiplier: - type: float - default: - description: | - The CPU core multiplier to use when configuring worker processes for - this service. By default, the number of workers for each daemon is - set to twice the number of CPU cores a service unit has. When deployed - in a LXD container, this default value will be capped to 4 workers - unless this configuration option is set. - aa-profile-mode: + Used by the nrpe-external-master subordinate charm. + A string that will be prepended to instance name to set the host name + in Nagios. So for instance the hostname would be something like: + juju-myservice-0 + If you're running multiple environments with the same services in them + this allows you to differentiate between them. + nagios_servicegroups: type: string - default: 'disable' + default: "" description: | - Experimental enable apparmor profile. Valid settings: 'complain', 'enforce' or 'disable'. - AA disabled by default. - enable-metadata-network: - type: boolean - default: False - description: | - The metadata network is used by solutions which do not leverage the l3 - agent for providing access to the metadata service. - enable-isolated-metadata: - type: boolean - default: False - description: | - Enable metadata on an isolated network (no router ports). + A comma-separated list of Nagios service groups. + If left empty, the nagios_context will be used as the servicegroup