From ead017942b280959d2996f4ca8981e791f7b4fa6 Mon Sep 17 00:00:00 2001 From: Jonathan Arrance Date: Tue, 13 Sep 2016 12:56:48 -0400 Subject: [PATCH] Changed the templates and layer.yaml file to reflect how layers are pulled form openstack-principle --- src/layer.yaml | 2 +- src/lib/charm/openstack/trove.py | 3 +- src/templates/mitaka/trove-conductor.conf | 28 +------------- src/templates/mitaka/trove-guestagent.conf | 22 ----------- src/templates/mitaka/trove-taskmanager.conf | 27 +------------- src/templates/mitaka/trove.conf | 41 +-------------------- 6 files changed, 8 insertions(+), 115 deletions(-) diff --git a/src/layer.yaml b/src/layer.yaml index ff0efde..a71fc3a 100644 --- a/src/layer.yaml +++ b/src/layer.yaml @@ -1,4 +1,4 @@ -includes: ['layer:openstack-api', 'interface:hacluster', 'interface:openstack-ha', 'interface:mysql-shared', 'interface:rabbitmq', 'interface:keystone'] +includes: ['layer:openstack-api'] options: basic: use_venv: True diff --git a/src/lib/charm/openstack/trove.py b/src/lib/charm/openstack/trove.py index c909147..cbb2962 100644 --- a/src/lib/charm/openstack/trove.py +++ b/src/lib/charm/openstack/trove.py @@ -185,7 +185,8 @@ class TroveCharm(charms_openstack.charm.HAOpenStackCharm): # Note that the hsm interface is optional - defined in config.yaml #required_relations = ['shared-db', 'amqp', 'identity-service', 'image-service', 'cloud-compute', 'cluster',cinder heat swift] - required_relations = ['shared-db', 'amqp', 'identity-service', 'image-service', 'cloud-compute', 'cinder-volume-service'] + #required_relations = ['shared-db', 'amqp', 'identity-service', 'image-service', 'cloud-compute', 'cinder-volume-service'] + required_relations = ['shared-db', 'amqp', 'identity-service'] restart_map = { TROVE_CONF: services, diff --git a/src/templates/mitaka/trove-conductor.conf b/src/templates/mitaka/trove-conductor.conf index 9a09df1..f671587 100644 --- a/src/templates/mitaka/trove-conductor.conf +++ b/src/templates/mitaka/trove-conductor.conf @@ -28,30 +28,6 @@ control_exchange = trove # If False doesn't trace SQL requests. #trace_sqlalchemy = True -[database] -#{% include "parts/database" %} -connection = {{ shared_db.uri }} +{% include "parts/section-database" %} -[oslo_messaging_rabbit] -#{% include "parts/section-rabbitmq-oslo" %} -{% if rabbitmq_host or rabbitmq_hosts -%} -rabbit_userid = {{ rabbitmq_user }} -rabbit_virtual_host = {{ rabbitmq_virtual_host }} -rabbit_password = {{ rabbitmq_password }} -{% if rabbitmq_hosts -%} -rabbit_hosts = {{ rabbitmq_hosts }} -{% if rabbitmq_ha_queues -%} -rabbit_ha_queues = True -rabbit_durable_queues = False -{% endif -%} -{% else -%} -rabbit_host = {{ rabbitmq_host }} -{% endif -%} -{% if rabbit_ssl_port -%} -rabbit_use_ssl = True -rabbit_port = {{ rabbit_ssl_port }} -{% if rabbit_ssl_ca -%} -kombu_ssl_ca_certs = {{ rabbit_ssl_ca }} -{% endif -%} -{% endif -%} -{% endif -%} \ No newline at end of file +{% include "parts/section-rabbitmq-oslo" %} diff --git a/src/templates/mitaka/trove-guestagent.conf b/src/templates/mitaka/trove-guestagent.conf index 7e05127..af9b9bd 100644 --- a/src/templates/mitaka/trove-guestagent.conf +++ b/src/templates/mitaka/trove-guestagent.conf @@ -82,29 +82,7 @@ log_config_append = /etc/trove/trove-logging-guestagent.conf # If False doesn't trace SQL requests. #trace_sqlalchemy = True -[oslo_messaging_rabbit] {% include "parts/section-rabbitmq-oslo" %} -#{% if rabbitmq_host or rabbitmq_hosts -%} -#rabbit_userid = {{ rabbitmq_user }} -#rabbit_virtual_host = {{ rabbitmq_virtual_host }} -#rabbit_password = {{ rabbitmq_password }} -#{% if rabbitmq_hosts -%} -#rabbit_hosts = {{ rabbitmq_hosts }} -#{% if rabbitmq_ha_queues -%} -#rabbit_ha_queues = True -#rabbit_durable_queues = False -#{% endif -%} -#{% else -%} -#rabbit_host = {{ rabbitmq_host }} -#{% endif -%} -#{% if rabbit_ssl_port -%} -#rabbit_use_ssl = True -#rabbit_port = {{ rabbit_ssl_port }} -#{% if rabbit_ssl_ca -%} -#kombu_ssl_ca_certs = {{ rabbit_ssl_ca }} -#{% endif -%} -#{% endif -%} -#{% endif -%} # ========== Datastore Specific Configuration Options ========== diff --git a/src/templates/mitaka/trove-taskmanager.conf b/src/templates/mitaka/trove-taskmanager.conf index 7a4807c..a9a20bc 100644 --- a/src/templates/mitaka/trove-taskmanager.conf +++ b/src/templates/mitaka/trove-taskmanager.conf @@ -96,31 +96,6 @@ device_path = /dev/vdb #mount_point = /var/lib/vertica #taskmanager_strategy = trove.common.strategies.cluster.experimental.vertica.taskmanager.VerticaTaskManagerStrategy - {% include "parts/section-rabbitmq-oslo" %} -#[oslo_messaging_rabbit] -#{% if rabbitmq_host or rabbitmq_hosts -%} -#rabbit_userid = {{ rabbitmq_user }} -#rabbit_virtual_host = {{ rabbitmq_virtual_host }} -#rabbit_password = {{ rabbitmq_password }} -#{% if rabbitmq_hosts -%} -#rabbit_hosts = {{ rabbitmq_hosts }} -#{% if rabbitmq_ha_queues -%} -#rabbit_ha_queues = True -#rabbit_durable_queues = False -#{% endif -%} -#{% else -%} -#rabbit_host = {{ rabbitmq_host }} -#{% endif -%} -#{% if rabbit_ssl_port -%} -#rabbit_use_ssl = True -#rabbit_port = {{ rabbit_ssl_port }} -#{% if rabbit_ssl_ca -%} -#kombu_ssl_ca_certs = {{ rabbit_ssl_ca }} -#{% endif -%} -#{% endif -%} -#{% endif -%} -[database] -#{% include "parts/database" %} -connection = {{ shared_db.uri }} +{% include "parts/section-database" %} \ No newline at end of file diff --git a/src/templates/mitaka/trove.conf b/src/templates/mitaka/trove.conf index fb279e0..06d2df9 100644 --- a/src/templates/mitaka/trove.conf +++ b/src/templates/mitaka/trove.conf @@ -56,48 +56,11 @@ neutron_service_type = network #max_backups_per_tenant = 5 #volume_time_out=30 -#[oslo_messaging_rabbit] -#{% if rabbitmq_host or rabbitmq_hosts -%} -#rabbit_userid = {{ rabbit_user }} -#rabbit_virtual_host = {{ rabbit_vhost }} -#rabbit_password = {{ rabbit_password }} -#{% if rabbitmq_hosts -%} -#rabbit_hosts = {{ rabbitmq_hosts }} -#{% if rabbitmq_ha_queues -%} -#rabbit_ha_queues = True -#rabbit_durable_queues = False -#{% endif -%} -#{% else -%} -#rabbit_host = {{ rabbitmq_host }} -#{% endif -%} -#{% if rabbit_ssl_port -%} -#rabbit_use_ssl = True -#rabbit_port = {{ rabbit_ssl_port }} -#{% if rabbit_ssl_ca -%} -#kombu_ssl_ca_certs = {{ rabbit_ssl_ca }} -#{% endif -%} -#{% endif -%} -#{% endif -%} - {% include "parts/section-rabbitmq-oslo" %} -[database] -#connection = mysql://trove:TROVE_DBPASS@controller/trove -#{% include "parts/database" %} -connection = {{ shared_db.uri }} +{% include "parts/section-database" %} -{% include "section-keystone-authtoken-mitaka" %} -#[keystone_authtoken] -#{% if identity_service.auth_host -%} -#auth_uri = {{ identity_service.service_protocol }}://{{ identity_service.service_host }}:{{ identity_service.service_port }} -#auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }} -#auth_plugin = password -#project_domain_id = default -#user_domain_id = default -#project_name = {{ identity_service.service_tenant }} -#username = {{ identity_service.service_username }} -#password = {{ identity_service.service_password }} -#{% endif -%} +{% include "parts/section-keystone-authtoken" %} [mysql] root_on_create = False