openstack/charm-barbican
Code Issues Proposed changes

Fixes

Browse Source
This commit is contained in:
Liam Young 2015-12-11 10:44:45 +00:00
parent 9989fd8cb3
commit 653329d5bb
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
barbican/reactive/barbican.py
View File

@ -20,6 +20,9 @@ from charmhelpers.core.hookenv import config
from charmhelpers.core.hookenv import status_set from charmhelpers.core.hookenv import status_set
from charmhelpers.core.templating import render from charmhelpers.core.templating import render
from charmhelpers.core.hookenv import unit_private_ip from charmhelpers.core.hookenv import unit_private_ip
from charmhelpers.contrib.openstack.templating import get_loader
from charmhelpers.contrib.openstack.utils import os_release
API_PORTS = { API_PORTS = {
'barbican-api': 9311, 'barbican-api': 9311,
'barbican-public-api': 9311, 'barbican-public-api': 9311,
@ -80,14 +83,16 @@ def setup_endpoint(keystone):
keystone.register_endpoints('keystore', config('region'), public_url, keystone.register_endpoints('keystore', config('region'), public_url,
internal_url, admin_url) internal_url, admin_url)
@when('shared-db.available')
@when('database.available')
@when('identity-service.available') @when('identity-service.available')
@when('amqp.available') @when('amqp.available')
def conf_amqp_req(*args): def render_stuff(*args):
adapters = BarbicanAdapters(args) adapters = BarbicanAdapters(args)
#release = os_release('barbican-common')
release = os_release('python-keystonemiddleware')
for conf in [BARBICAN_ADMIN_PASTE_CONF, BARBICAN_API_CONF, for conf in [BARBICAN_ADMIN_PASTE_CONF, BARBICAN_API_CONF,
BARBICAN_API_PASTE_CONF]: BARBICAN_API_PASTE_CONF]:
render(source=conf, render(source=conf,
template_loader=get_loader('templates/', release),
target='{}/{}'.format(BARBICAN_DIR, conf), target='{}/{}'.format(BARBICAN_DIR, conf),
context=adapters) context=adapters)

8
barbican/templates/juno/barbican-api.conf
View File

@ -1,9 +1,9 @@
[DEFAULT] [DEFAULT]
# Show more verbose log output (sets INFO log level output) # Show more verbose log output (sets INFO log level output)
verbose = {{ verbose }} verbose = {{ options.verbose }}
# Show debugging output in logs (sets DEBUG log level output) # Show debugging output in logs (sets DEBUG log level output)
debug = {{ debug }} debug = {{ options.debug }}
# Address to bind the API server # Address to bind the API server
bind_host = 0.0.0.0 bind_host = 0.0.0.0
@ -38,7 +38,6 @@ max_allowed_request_size_in_bytes = 1000000
#sql_connection = sqlite:///barbican.sqlite #sql_connection = sqlite:///barbican.sqlite
# Note: For absolute addresses, use '////' slashes after 'sqlite:' # Note: For absolute addresses, use '////' slashes after 'sqlite:'
# Uncomment for a more global development environment # Uncomment for a more global development environment
{% include "parts/database" %}
# Period in seconds after which SQLAlchemy should reestablish its connection # Period in seconds after which SQLAlchemy should reestablish its connection
# to the database. # to the database.
@ -113,9 +112,10 @@ policy_file=/etc/barbican/policy.json
policy_default_rule=default policy_default_rule=default
{% include "parts/section-database" %}
# ================= Queue Options - oslo.messaging ========================== # ================= Queue Options - oslo.messaging ==========================
{% include "parts/rabbitmq" %} {% include "parts/section-rabbitmq-oslo" %}
# For HA, specify queue nodes in cluster as 'user@host:5672', comma delimited, ending with '/offset': # For HA, specify queue nodes in cluster as 'user@host:5672', comma delimited, ending with '/offset':
# For example: transport_url = rabbit://guest@192.168.50.8:5672,guest@192.168.50.9:5672/ # For example: transport_url = rabbit://guest@192.168.50.8:5672,guest@192.168.50.9:5672/