From 5dd3d9d85105e99fd1e624b4a9b24ec3d118ee17 Mon Sep 17 00:00:00 2001 From: Edward Hope-Morley Date: Wed, 7 Jun 2017 09:59:32 +0100 Subject: [PATCH] Cleanup config.yaml Change-Id: Iafcf482dd75e808207611cc03fa552a751aa3e9e --- config.yaml | 200 +++++++++++++++++++++++++--------------------------- 1 file changed, 97 insertions(+), 103 deletions(-) diff --git a/config.yaml b/config.yaml index a2f391b..6c82fa7 100644 --- a/config.yaml +++ b/config.yaml @@ -1,107 +1,105 @@ options: debug: - default: False type: boolean + default: False description: Enable debug logging. verbose: - default: False type: boolean + default: False description: Enable verbose logging. - metering-time-to-live: - type: int - default: -1 - description: | - Number of seconds that samples are kept in the database for (<= 0 means forever) - event-time-to-live: - type: int - default: -1 - description: | - Number of seconds that events are kept in the database for (<= 0 means forever) use-syslog: type: boolean default: False 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 - * ... - + . + 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. + 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. + metering-time-to-live: + type: int + default: -1 + description: | + Number of seconds that samples are kept in the database for (<= 0 means + infinite). + event-time-to-live: + type: int + default: -1 + description: | + Number of seconds that events are kept in the database for (<= 0 means + infinite). region: + type: string default: RegionOne - type: string - description: OpenStack Region + description: OpenStack region name. rabbit-user: - default: ceilometer type: string + default: ceilometer description: Username to request access on rabbitmq-server. rabbit-vhost: + type: string default: openstack - type: string description: RabbitMQ virtual host to request access on rabbitmq-server. - ssl_cert: - type: string - default: - description: | - SSL certificate to install and use for API ports. Setting this value - and ssl_key will enable reverse proxying, point Ceilometer's entry in the - Keystone catalog to use https, and override any certficiate and key - issued by Keystone (if it is configured to do so). - ssl_key: - type: string - default: - description: SSL key to use with certificate specified as ssl_cert. - ssl_ca: - type: string - default: - description: | - SSL CA to use with the certificate and key provided - this is only - required if you are providing a privately signed ssl_cert and ssl_key. + api-workers: + type: int + default: 1 + description: | + Number of workers for Ceilometer API server. (>= Kilo). + # Monitoring config nagios_context: - default: "juju" type: string + default: "juju" 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 + 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 are running multiple environments with the same services in them this allows you to differentiate between them. nagios_servicegroups: - default: "" type: string + default: "" description: | - A comma-separated list of nagios servicegroups. - If left empty, the nagios_context will be used as the servicegroup - # Network configuration options - # by default all access is over 'private-address' + A comma-separated list of nagios service groups. + If left empty, the nagios_context will be used as the servicegroup + # Network config (by default all access is over 'private-address') os-admin-network: type: string default: description: | The IP address and netmask of the OpenStack Admin network (e.g. 192.168.0.0/24) - + . This network will be used for admin endpoints. os-internal-network: type: string @@ -109,7 +107,7 @@ options: description: | The IP address and netmask of the OpenStack Internal network (e.g. 192.168.0.0/24) - + . This network will be used for internal endpoints. os-public-network: type: string @@ -125,11 +123,11 @@ options: description: | The hostname or address of the public endpoints created for ceilometer in the keystone identity provider. - + . This value will be used for public endpoints. For example, an os-public-hostname set to 'ceilometer.example.com' with ssl enabled will create the following public endpoints for ceilometer: - + . https://ceilometer.example.com:8777/ os-internal-hostname: type: string @@ -137,11 +135,11 @@ options: description: | The hostname or address of the internal endpoints created for ceilometer in the keystone identity provider. - + . This value will be used for internal endpoints. For example, an os-internal-hostname set to 'ceilometer.internal.example.com' with ssl enabled will create the following internal endpoints for ceilometer: - + . https://ceilometer.internal.example.com:8777/ os-admin-hostname: type: string @@ -149,25 +147,43 @@ options: description: | The hostname or address of the admin endpoints created for ceilometer in the keystone identity provider. - + . This value will be used for admin endpoints. For example, an os-admin-hostname set to 'ceilometer.admin.example.com' with ssl enabled will create the following admin endpoints for ceilometer: - + . https://ceilometer.admin.example.com:8777/ - # HA configuration settings + ssl_cert: + type: string + default: + description: | + SSL certificate to install and use for API ports. Setting this value + and ssl_key will enable reverse proxying, point Ceilometer's entry in the + Keystone catalog to use https, and override any certificate and key + issued by Keystone (if it is configured to do so). + ssl_key: + type: string + default: + description: SSL key to use with certificate specified as ssl_cert. + ssl_ca: + type: string + default: + description: | + SSL CA to use with the certificate and key provided - this is only + required if you are providing a privately signed ssl_cert and ssl_key. + # HA config dns-ha: type: boolean default: False description: | - Use DNS HA with MAAS 2.0. Note if this is set do not set vip - settings below. + Use DNS HA with MAAS 2.0. Note if this is set do not set vip settings + below. vip: type: string default: description: | Virtual IP(s) to use to front API services in HA configuration. - + . If multiple networks are being used, a VIP should be provided for each network, separated by spaces. ha-bindiface: @@ -182,49 +198,27 @@ options: description: | Default multicast port number that will be used to communicate between HA Cluster nodes. - api-workers: - type: int - default: 1 - description: | - Number of workers for Ceilometer API server. (>= Kilo). - 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. haproxy-server-timeout: type: int default: description: | - Server timeout configuration in ms for haproxy, used in HA - configurations. If not provided, default value of 30000ms is used. + Server timeout configuration in ms for haproxy, used in HA + configurations. If not provided, default value of 30000ms is used. haproxy-client-timeout: type: int default: description: | - Client timeout configuration in ms for haproxy, used in HA - configurations. If not provided, default value of 30000ms is used. + Client timeout configuration in ms for haproxy, used in HA + configurations. If not provided, default value of 30000ms is used. haproxy-queue-timeout: type: int default: description: | - Queue timeout configuration in ms for haproxy, used in HA - configurations. If not provided, default value of 5000ms is used. + Queue timeout configuration in ms for haproxy, used in HA + configurations. If not provided, default value of 5000ms is used. haproxy-connect-timeout: type: int default: description: | - Connect timeout configuration in ms for haproxy, used in HA - configurations. If not provided, default value of 5000ms is used. - harden: - default: - type: string - description: | - Apply system hardening. Supports a space-delimited list of modules - to run. Supported modules currently include os, ssh, apache and mysql. - + Connect timeout configuration in ms for haproxy, used in HA + configurations. If not provided, default value of 5000ms is used.