diff options
Diffstat (limited to 'deploy/adapters/ansible/roles/ceilometer_controller/templates')
4 files changed, 4 insertions, 51 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 deleted file mode 100644 index d0cadeaa..00000000 --- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 +++ /dev/null @@ -1,37 +0,0 @@ -[DEFAULT] -rpc_backend = rabbit -auth_strategy = keystone -verbose = True - -[oslo_messaging_rabbit] -rabbit_host = {{ internal_vip.ip }} -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} - -[database] -connection = mongodb://ceilometer:{{ CEILOMETER_DBPASS }}@{{ internal_vip.ip }}:27017/ceilometer - -[keystone_authtoken] -auth_uri = http://{{ internal_vip.ip }}:5000 -auth_url = http://{{ internal_vip.ip }}:35357 -identity_uri = http://{{ internal_vip.ip }}:35357 -auth_plugin = password -project_domain_id = default -user_domain_id = default -project_name = service -username = ceilometer -password = {{ CEILOMETER_PASS }} - -[service_credentials] -os_auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -os_username = ceilometer -os_tenant_name = service -os_password = {{ CEILOMETER_PASS }} -os_endpoint_type = internalURL -os_region_name = RegionOne - -[publisher] -metering_secret = {{ metering_secret }} - -[api] -host = {{ internal_ip }} diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2 deleted file mode 100644 index dfd04739..00000000 --- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2 +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -notification_driver = messagingv2 diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2 deleted file mode 100644 index a513d2c1..00000000 --- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2 +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -notification_driver = messagingv2 -rpc_backend = rabbit - -[oslo_messaging_rabbit] -rabbit_host = {{ internal_vip.ip }} -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2 index 9909f800..c876efda 100644 --- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2 +++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2 @@ -6,10 +6,10 @@ <VirtualHost {{ internal_ip }}:8777> WSGIDaemonProcess ceilometer-api processes=4 threads={{ work_threads }} user=ceilometer group=ceilometer display-name=%{GROUP} WSGIProcessGroup ceilometer-api - WSGIScriptAlias / /usr/lib/python2.7/dist-packages/ceilometer/api/app.wsgi + WSGIScriptAlias / {{ WSGIScriptAlias_path }} WSGIApplicationGroup %{GLOBAL} - ErrorLog /var/log/apache2/ceilometer_error.log - CustomLog /var/log/apache2/ceilometer_access.log combined + ErrorLog /var/log/{{ http_service_name }}/ceilometer_error.log + CustomLog /var/log/{{ http_service_name }}/ceilometer_access.log combined <Directory /usr/lib/python2.7/dist-packages/ceilometer/api/> <IfVersion >= 2.4> @@ -22,4 +22,4 @@ </Directory> </VirtualHost> -WSGISocketPrefix /var/run/apache2 +WSGISocketPrefix /var/run/{{ http_service_name }} |