Use pbr WSGI script to build gnocchi-api

Removes host and port from api section of config file template.
Also cleans up Ansible Lint warnings

Related-To: I2298f9cb94a684747f4b4dbc262cdcab7de49175
Change-Id: I56954df3d13b86cfcb4eb68e419ce13dfac2c051
This commit is contained in:
Steve Lewis 2016-07-07 11:25:12 -07:00
parent aa0a0d6f5b
commit aa328e6da4
5 changed files with 4 additions and 15 deletions

View File

@ -1,6 +1,6 @@
---
# Copyright 2015, Rackspace US, Inc.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -19,7 +19,7 @@
state: directory
owner: "{{ system_user }}"
group: "{{ system_group }}"
mode: "2755"
mode: "02755"
with_items:
- { path: "/var/run" }
- { path: "/var/lock" }

View File

@ -19,13 +19,6 @@ activate_this = os.path.expanduser("{{ gnocchi_venv_bin }}/activate_this.py")
execfile(activate_this, dict(__file__=activate_this))
{% endif %}
from oslo_config import cfg
from gnocchi import service
from gnocchi.rest import app
# Initialize the oslo configuration library and logging
conf = service.prepare_service()
# The pecan debugger cannot be used in wsgi mode
conf.set_default('pecan_debug', False, group='api')
application = app.load_app(conf)
application = app.build_wsgi_app()

View File

@ -4,10 +4,6 @@
debug = {{ debug }}
fatal_deprecations = {{ gnocchi_fatal_deprecations }}
[api]
host = {{ gnocchi_service_address }}
port = {{ gnocchi_service_port }}
{% if gnocchi_ssl_external | bool %}
[oslo_middleware]
secure_proxy_ssl_header = {{ gnocchi_secure_proxy_ssl_header }}

View File

@ -6,7 +6,7 @@ gnocchi_developer_mode: true
gnocchi_galera_password: "secrete"
gnocchi_service_password: "secrete"
gnocchi_galera_address: 10.100.100.2
gnocchi_use_mod_wsgi: false
gnocchi_use_mod_wsgi: true
gnocchi_ssl_external: false
keystone_admin_tenant_name: admin
keystone_admin_user_name: admin