From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Mon, 19 Dec 2016 11:06:36 +0800 Subject: master only support newton JIRA: COMPASS-513 Remove other roles and ppa, master only support newton. Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00 Signed-off-by: liyuenan --- .../roles/glance/templates/glance-registry.conf | 64 ---------------------- 1 file changed, 64 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-registry.conf (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-registry.conf') diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-registry.conf b/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-registry.conf deleted file mode 100644 index ccd8f1bb..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-registry.conf +++ /dev/null @@ -1,64 +0,0 @@ -{% set workers = ansible_processor_vcpus // 2 %} -{% set workers = workers if workers else 1 %} -{% set memcached_servers = [] %} -{% set rabbitmq_servers = [] %} -{% for host in haproxy_hosts.values() %} -{% set _ = memcached_servers.append('%s:11211'% host) %} -{% set _ = rabbitmq_servers.append('%s:5672'% host) %} -{% endfor %} -{% set memcached_servers = memcached_servers|join(',') %} -{% set rabbitmq_servers = rabbitmq_servers|join(',') %} - -[DEFAULT] -verbose = {{ VERBOSE }} -debug = {{ DEBUG }} -log_file = /var/log/glance/api.log -bind_host = {{ image_host }} -bind_port = 9191 -backlog = 4096 -workers = {{ workers }} - -notification_driver = messagingv2 -rpc_backend = rabbit - -[database] -backend = sqlalchemy -connection = mysql://glance:{{ GLANCE_DBPASS }}@{{ db_host }}/glance?charset=utf8 -idle_timeout = 30 - -[profiler] -enabled = True - -[keystone_authtoken] -auth_uri = http://{{ internal_vip.ip }}:5000 -auth_url = http://{{ internal_vip.ip }}:35357 -memcached_servers = {{ memcached_servers }} -auth_type = password -project_domain_name = default -user_domain_name = default -project_name = service -username = glance -password = {{ GLANCE_PASS }} - -identity_uri = http://{{ internal_vip.ip }}:35357 -admin_tenant_name = service -admin_user = glance -admin_password = {{ GLANCE_PASS }} -token_cache_time = 300 -revocation_cache_time = 60 - -[paste_deploy] -flavor= keystone - -[oslo_messaging_amqp] -idle_timeout = 7200 - -[oslo_messaging_rabbit] -rabbit_hosts = {{ rabbitmq_servers }} -rabbit_use_ssl = false -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} -rabbit_virtual_host = / -rabbit_notification_exchange = glance -rabbit_notification_topic = notifications -rabbit_durable_queues = False -- cgit 1.2.3-korg