openstack
/
charm-trove
Code Issues Proposed changes

removed some cruft from the templates.

This commit is contained in:
Jonathan Arrance 2016-09-14 00:19:53 -04:00
parent 9b7d223983
commit a289c21110
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/templates/mitaka/trove-taskmanager.conf
View File

@ -5,17 +5,10 @@ verbose = {{ options.verbose }}
# Show debugging output in logs (sets DEBUG log level output)
debug = {{ options.debug }}
# Update the service and instance statuses if the instances fails to become
# active within the configured usage_timeout.
# usage_timeout = 600
# restore_usage_timeout = 36000
update_status_on_fail = True
log_dir = /var/log/trove
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ options.keystone_api_version }}.0
#nova_compute_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8774/v2
#cinder_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8776/v1
#swift_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8080/v1/AUTH_
notifier_queue_hostname = controller
backend = rabbit
@ -26,16 +19,6 @@ control_exchange = trove
#DB Api Implementation
db_api_implementation = trove.db.sqlalchemy.api
# Configuration options for talking to nova via the novaclient.
# These options are for an admin user in your keystone config.
# It proxy's the token received from the user to send to nova
# via this admin users creds,
# basically acting like the client via that proxy token.
#{% include "parts/section-nova" %}
#nova_proxy_admin_user = admin
#nova_proxy_admin_pass = ADMIN_PASS
#nova_proxy_admin_tenant_name = service
taskmanager_manager = trove.taskmanager.manager.Manager
# Region name of this node. Used when searching catalog. Default value is None.
@ -60,8 +43,6 @@ volume_time_out=30
server_delete_time_out=480
[mysql]
# Format (single port or port range): A, B-C
# where C greater than B
tcp_ports = 3306
volume_support = True
device_path = /dev/vdb

3
src/templates/mitaka/trove.conf
View File

@ -2,9 +2,6 @@
auth_strategy = keystone
log_dir = /var/log/trove
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ options.keystone_api_version }}.0
#nova_compute_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8774/v2
#cinder_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8776/v1
#swift_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8080/v1/AUTH_
notifier_queue_hostname = controller
# Show more verbose log output (sets INFO log level output)