summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-21 17:03:05 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-21 17:03:28 (GMT)
commitd545e7045afd273f539c73de11d9d99fef50f8ad (patch)
tree7218a24575ca3d1bcd8962820cfd3d219e2fd923
parent2cac749aec83d4c3bbc69a7b788610306b4e88e9 (diff)
downloaddefinitions-baserock/franred/add-conf-template-files.tar.gz
Openstack: Add back the custom configuration for ceilometerbaserock/franred/add-conf-template-files
Modify os_auth_url from Juno version because of https://bugs.launchpad.net/ceilometer/+bug/1455848 Change-Id: I3f1f272600b89abe64d7361acedfd6447a90d0b9
-rw-r--r--openstack/usr/share/openstack/ceilometer/ceilometer.conf47
1 files changed, 25 insertions, 22 deletions
diff --git a/openstack/usr/share/openstack/ceilometer/ceilometer.conf b/openstack/usr/share/openstack/ceilometer/ceilometer.conf
index 66a1db1..9d28b32 100644
--- a/openstack/usr/share/openstack/ceilometer/ceilometer.conf
+++ b/openstack/usr/share/openstack/ceilometer/ceilometer.conf
@@ -4,6 +4,8 @@
# From ceilometer
#
+auth_strategy = keystone
+
# To reduce large requests at same time to Nova or other components
# from different compute agents, shuffle start time of polling task.
# (integer value)
@@ -135,7 +137,7 @@
# Use syslog for logging. Existing syslog format is DEPRECATED during
# I, and will change in J to honor RFC5424. (boolean value)
-#use_syslog = false
+use_syslog = True
# (Optional) Enables or disables syslog rfc5424 format for logging. If
# enabled, prefixes the MSG part of the syslog message with APP-NAME
@@ -221,7 +223,7 @@
#rootwrap_config = /etc/ceilometer/rootwrap.conf
# Exchange name for Cinder notifications. (string value)
-#cinder_control_exchange = cinder
+cinder_control_exchange = cinder
#
# From oslo.messaging
@@ -282,7 +284,7 @@
# The messaging driver to use, defaults to rabbit. Other drivers
# include qpid and zmq. (string value)
-#rpc_backend = rabbit
+rpc_backend = rabbit
# The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the transport_url
@@ -351,10 +353,10 @@
# The port for the ceilometer API server. (integer value)
# Deprecated group/name - [DEFAULT]/metering_api_port
-#port = 8777
+port = 8777
# The listen IP for the ceilometer API server. (string value)
-#host = 0.0.0.0
+host = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
# Toggle Pecan Debug Middleware. (boolean value)
#pecan_debug = false
@@ -488,6 +490,7 @@
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
#connection = <None>
+connection=postgresql://{{ CEILOMETER_DB_USER }}:{{ CEILOMETER_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/ceilometer
# The SQLAlchemy connection string to use to connect to the slave
# database. (string value)
@@ -642,7 +645,7 @@
#
# Complete public Identity API endpoint. (string value)
-#auth_uri = <None>
+auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
# API version of the admin Identity API endpoint. (string value)
#auth_version = <None>
@@ -785,7 +788,7 @@
# Complete admin Identity API endpoint. This should specify the
# unversioned root endpoint e.g. https://localhost:35357/ (string
# value)
-#identity_uri = <None>
+identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357
# This option is deprecated and may be removed in a future release.
# Single shared secret with the Keystone configuration used for
@@ -795,13 +798,13 @@
#admin_token = <None>
# Service username. (string value)
-#admin_user = <None>
+admin_user = {{ CEILOMETER_SERVICE_USER }}
# Service user password. (string value)
-#admin_password = <None>
+admin_password = {{ CEILOMETER_SERVICE_PASSWORD }}
# Service tenant name. (string value)
-#admin_tenant_name = admin
+admin_tenant_name = service
[matchmaker_redis]
@@ -1047,12 +1050,12 @@
# The RabbitMQ broker address where a single node is used. (string
# value)
# Deprecated group/name - [DEFAULT]/rabbit_host
-#rabbit_host = localhost
+rabbit_host = {{ RABBITMQ_HOST }}
# The RabbitMQ broker port where a single node is used. (integer
# value)
# Deprecated group/name - [DEFAULT]/rabbit_port
-#rabbit_port = 5672
+rabbit_port = {{ RABBITMQ_PORT }}
# RabbitMQ HA cluster host:port pairs. (list value)
# Deprecated group/name - [DEFAULT]/rabbit_hosts
@@ -1060,15 +1063,15 @@
# Connect over SSL for RabbitMQ. (boolean value)
# Deprecated group/name - [DEFAULT]/rabbit_use_ssl
-#rabbit_use_ssl = false
+rabbit_use_ssl = false
# The RabbitMQ userid. (string value)
# Deprecated group/name - [DEFAULT]/rabbit_userid
-#rabbit_userid = guest
+rabbit_userid = {{ RABBITMQ_USER }}
# The RabbitMQ password. (string value)
# Deprecated group/name - [DEFAULT]/rabbit_password
-#rabbit_password = guest
+rabbit_password = {{ RABBITMQ_PASSWORD }}
# The RabbitMQ login method. (string value)
# Deprecated group/name - [DEFAULT]/rabbit_login_method
@@ -1076,7 +1079,7 @@
# The RabbitMQ virtual host. (string value)
# Deprecated group/name - [DEFAULT]/rabbit_virtual_host
-#rabbit_virtual_host = /
+rabbit_virtual_host = /
# How frequently to retry connecting with RabbitMQ. (integer value)
#rabbit_retry_interval = 1
@@ -1216,11 +1219,11 @@
# User name to use for OpenStack service access. (string value)
# Deprecated group/name - [DEFAULT]/os_username
-#os_username = ceilometer
+os_username = {{ CEILOMETER_SERVICE_USER }}
# Password to use for OpenStack service access. (string value)
# Deprecated group/name - [DEFAULT]/os_password
-#os_password = admin
+os_password = {{ CEILOMETER_SERVICE_PASSWORD }}
# Tenant ID to use for OpenStack service access. (string value)
# Deprecated group/name - [DEFAULT]/os_tenant_id
@@ -1228,22 +1231,22 @@
# Tenant name to use for OpenStack service access. (string value)
# Deprecated group/name - [DEFAULT]/os_tenant_name
-#os_tenant_name = admin
+os_tenant_name = service
# Certificate chain for SSL validation. (string value)
#os_cacert = <None>
# Auth URL to use for OpenStack service access. (string value)
# Deprecated group/name - [DEFAULT]/os_auth_url
-#os_auth_url = http://localhost:5000/v2.0
+os_auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:35357
# Region name to use for OpenStack service endpoints. (string value)
# Deprecated group/name - [DEFAULT]/os_region_name
-#os_region_name = <None>
+os_region_name = regionOne
# Type of endpoint in Identity service catalog to use for
# communication with OpenStack services. (string value)
-#os_endpoint_type = publicURL
+os_endpoint_type = internalURL
# Disables X.509 certificate validation when an SSL connection to
# Identity Service is established. (boolean value)