Changed the templates and layer.yaml file to reflect how layers are pulled form openstack-principle
This commit is contained in:
parent
b4a62da897
commit
ead017942b
@ -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:
|
options:
|
||||||
basic:
|
basic:
|
||||||
use_venv: True
|
use_venv: True
|
||||||
|
@ -185,7 +185,8 @@ class TroveCharm(charms_openstack.charm.HAOpenStackCharm):
|
|||||||
|
|
||||||
# Note that the hsm interface is optional - defined in config.yaml
|
# 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', '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 = {
|
restart_map = {
|
||||||
TROVE_CONF: services,
|
TROVE_CONF: services,
|
||||||
|
@ -28,30 +28,6 @@ control_exchange = trove
|
|||||||
# If False doesn't trace SQL requests.
|
# If False doesn't trace SQL requests.
|
||||||
#trace_sqlalchemy = True
|
#trace_sqlalchemy = True
|
||||||
|
|
||||||
[database]
|
{% include "parts/section-database" %}
|
||||||
#{% include "parts/database" %}
|
|
||||||
connection = {{ shared_db.uri }}
|
|
||||||
|
|
||||||
[oslo_messaging_rabbit]
|
{% include "parts/section-rabbitmq-oslo" %}
|
||||||
#{% 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 -%}
|
|
||||||
|
@ -82,29 +82,7 @@ log_config_append = /etc/trove/trove-logging-guestagent.conf
|
|||||||
# If False doesn't trace SQL requests.
|
# If False doesn't trace SQL requests.
|
||||||
#trace_sqlalchemy = True
|
#trace_sqlalchemy = True
|
||||||
|
|
||||||
[oslo_messaging_rabbit]
|
|
||||||
{% include "parts/section-rabbitmq-oslo" %}
|
{% 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 ==========
|
# ========== Datastore Specific Configuration Options ==========
|
||||||
|
|
||||||
|
@ -96,31 +96,6 @@ device_path = /dev/vdb
|
|||||||
#mount_point = /var/lib/vertica
|
#mount_point = /var/lib/vertica
|
||||||
#taskmanager_strategy = trove.common.strategies.cluster.experimental.vertica.taskmanager.VerticaTaskManagerStrategy
|
#taskmanager_strategy = trove.common.strategies.cluster.experimental.vertica.taskmanager.VerticaTaskManagerStrategy
|
||||||
|
|
||||||
|
|
||||||
{% include "parts/section-rabbitmq-oslo" %}
|
{% 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/section-database" %}
|
||||||
#{% include "parts/database" %}
|
|
||||||
connection = {{ shared_db.uri }}
|
|
@ -56,48 +56,11 @@ neutron_service_type = network
|
|||||||
#max_backups_per_tenant = 5
|
#max_backups_per_tenant = 5
|
||||||
#volume_time_out=30
|
#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" %}
|
{% include "parts/section-rabbitmq-oslo" %}
|
||||||
|
|
||||||
[database]
|
{% include "parts/section-database" %}
|
||||||
#connection = mysql://trove:TROVE_DBPASS@controller/trove
|
|
||||||
#{% include "parts/database" %}
|
|
||||||
connection = {{ shared_db.uri }}
|
|
||||||
|
|
||||||
{% include "section-keystone-authtoken-mitaka" %}
|
{% include "parts/section-keystone-authtoken" %}
|
||||||
#[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 -%}
|
|
||||||
|
|
||||||
[mysql]
|
[mysql]
|
||||||
root_on_create = False
|
root_on_create = False
|
||||||
|
Loading…
Reference in New Issue
Block a user