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/tasks/nfs.yml | 68 ---------------- .../roles/glance/templates/glance-api.conf | 93 ---------------------- .../roles/glance/templates/glance-registry.conf | 64 --------------- .../roles/glance/vars/Debian.yml | 21 ----- .../roles/glance/vars/RedHat.yml | 23 ------ 5 files changed, 269 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/glance/tasks/nfs.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-api.conf delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-registry.conf delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/glance/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/glance/vars/RedHat.yml (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/glance') diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/tasks/nfs.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/tasks/nfs.yml deleted file mode 100644 index 39a49dc1..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/tasks/nfs.yml +++ /dev/null @@ -1,68 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: install nfs packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: nfs_packages - -- name: install nfs - local_action: yum name={{ item }} state=present - with_items: - - rpcbind - - nfs-utils - run_once: True - -- name: create image directory - local_action: file path=/opt/images state=directory mode=0777 - run_once: True - -- name: remove nfs config item if exist - local_action: lineinfile dest=/etc/exports state=absent - regexp="^/opt/images" - run_once: True - -- name: update nfs config - local_action: lineinfile dest=/etc/exports state=present - line="/opt/images *(rw,insecure,sync,all_squash)" - run_once: True - -- name: restart compass nfs service - local_action: service name={{ item }} state=restarted enabled=yes - with_items: - - rpcbind - - nfs-server - run_once: True - -- name: get mount info - command: mount - register: mount_info - tags: - - recovery - -- name: get nfs server - shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf - register: ip_info - tags: - - recovery - -- name: restart host nfs service - service: name={{ item }} state=restarted enabled=yes - with_items: '{{ nfs_services }}' - -- name: mount image directory - shell: | - mkdir -p /var/lib/glance/images - mount -t nfs -onfsvers=3 {{ ip_info.stdout_lines[0] }}:/opt/images /var/lib/glance/images - sed -i '/\/var\/lib\/glance\/images/d' /etc/fstab - echo {{ ip_info.stdout_lines[0] }}:/opt/images /var/lib/glance/images/ nfs nfsvers=3 >> /etc/fstab - when: mount_info.stdout.find('images') == -1 - retries: 5 - delay: 3 - tags: - - recovery diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-api.conf b/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-api.conf deleted file mode 100644 index 241f04ce..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/templates/glance-api.conf +++ /dev/null @@ -1,93 +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 = 9292 -backlog = 4096 -workers = {{ workers }} -registry_host = {{ internal_ip }} -registry_port = 9191 -registry_client_protocol = http -cinder_catalog_info = volume:cinder:internalURL - -enable_v1_api = True -enable_v1_registry = True -enable_v2_api = True -enable_v2_registry = True - -notification_driver = messagingv2 -rpc_backend = rabbit - -delayed_delete = False -scrubber_datadir = /var/lib/glance/scrubber -scrub_time = 43200 -image_cache_dir = /var/lib/glance/image-cache/ -show_image_direct_url = True - -[database] -backend = sqlalchemy -connection = mysql://glance:{{ GLANCE_DBPASS }}@{{ db_host }}/glance?charset=utf8 -idle_timeout = 30 -sqlite_db = /var/lib/glance/glance.sqlite - -[task] -task_executor = taskflow - -[glance_store] -default_store = file -stores = file,http,cinder,rbd -filesystem_store_datadir = /var/lib/glance/images/ - -[image_format] -disk_formats = ami,ari,aki,vhd,vhdx,vmdk,raw,qcow2,vdi,iso,root-tar - -[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 }} -token_cache_time = 300 -revocation_cache_time = 60 - -identity_uri = http://{{ internal_vip.ip }}:35357 -admin_tenant_name = service -admin_user = glance -admin_password = {{ GLANCE_PASS }} - -[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 = / -default_notification_exchange = glance - -rabbit_notification_exchange = glance -rabbit_notification_topic = notifications -rabbit_durable_queues = False 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 diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/vars/Debian.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/vars/Debian.yml deleted file mode 100644 index d1825012..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/vars/Debian.yml +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -packages: - - glance - - nfs-common - -nfs_packages: - - nfs-common - -nfs_services: [] - -services: - - glance-registry - - glance-api diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/vars/RedHat.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/vars/RedHat.yml deleted file mode 100644 index 2987d0c4..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/glance/vars/RedHat.yml +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -packages: - - openstack-glance - - rpcbind - -nfs_packages: - - nfs-utils - - rpcbind - -nfs_services: - - rpcbind - -services: - - openstack-glance-api - - openstack-glance-registry -- cgit 1.2.3-korg