From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001 From: chigang Date: Fri, 30 Jun 2017 20:24:25 +0800 Subject: Remove obsoleted code JIRA:- use OpenStack-ansible deploy openstack, so remove obsoleted code. Some of the enhanced features will be added in later versions Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3 Signed-off-by: chigang --- .../adapters/ansible/roles/heat/handlers/main.yml | 15 ----- .../ansible/roles/heat/tasks/heat_config.yml | 15 ----- .../ansible/roles/heat/tasks/heat_install.yml | 71 ---------------------- deploy/adapters/ansible/roles/heat/tasks/main.yml | 23 ------- .../adapters/ansible/roles/heat/templates/heat.j2 | 58 ------------------ deploy/adapters/ansible/roles/heat/vars/Debian.yml | 19 ------ deploy/adapters/ansible/roles/heat/vars/RedHat.yml | 19 ------ deploy/adapters/ansible/roles/heat/vars/main.yml | 12 ---- 8 files changed, 232 deletions(-) delete mode 100644 deploy/adapters/ansible/roles/heat/handlers/main.yml delete mode 100644 deploy/adapters/ansible/roles/heat/tasks/heat_config.yml delete mode 100644 deploy/adapters/ansible/roles/heat/tasks/heat_install.yml delete mode 100644 deploy/adapters/ansible/roles/heat/tasks/main.yml delete mode 100644 deploy/adapters/ansible/roles/heat/templates/heat.j2 delete mode 100644 deploy/adapters/ansible/roles/heat/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/roles/heat/vars/RedHat.yml delete mode 100644 deploy/adapters/ansible/roles/heat/vars/main.yml (limited to 'deploy/adapters/ansible/roles/heat') diff --git a/deploy/adapters/ansible/roles/heat/handlers/main.yml b/deploy/adapters/ansible/roles/heat/handlers/main.yml deleted file mode 100644 index 84bda2e3..00000000 --- a/deploy/adapters/ansible/roles/heat/handlers/main.yml +++ /dev/null @@ -1,15 +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: restart heat service - service: name={{ item }} state=restarted enabled=yes - with_items: "{{ services | union(services_noarch) }}" - -- name: remove heat-sqlite-db - shell: rm /var/lib/heat/heat.sqlite || touch heat.sqlite.db.removed diff --git a/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml b/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml deleted file mode 100644 index d0835860..00000000 --- a/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml +++ /dev/null @@ -1,15 +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: heat db sync - shell: su -s /bin/sh -c "heat-manage db_sync" heat - notify: - - restart heat service - -- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml b/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml deleted file mode 100644 index ef50ec52..00000000 --- a/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml +++ /dev/null @@ -1,71 +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 -############################################################################## ---- -- include_vars: "{{ ansible_os_family }}.yml" - -- name: install heat related packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: "{{ packages | union(packages_noarch) }}" - -- name: generate heat service list - lineinfile: dest=/opt/service create=yes line='{{ item }}' - with_items: "{{ services | union(services_noarch) }}" - -- name: create heat domain - os_keystone_domain: - cloud: opnfv - name: heat - state: present - description: "Stack projects and users" - register: heat_domain - when: inventory_hostname == groups['controller'][0] - -- name: create heat user - os_user: - cloud: opnfv - domain: heat - name: heat_domain_admin - password: "{{ HEAT_PASS }}" - when: inventory_hostname == groups['controller'][0] - -- name: grant heat admin role - shell: | - . /opt/admin-openrc.sh - openstack role assignment list | grep "{{ heat_domain.id }}" \ - || openstack role add --domain heat --user-domain heat \ - --user heat_domain_admin admin; - when: inventory_hostname == groups['controller'][0] - -- name: create heat role - os_keystone_role: - cloud: opnfv - name: heat_stack_owner - when: inventory_hostname == groups['controller'][0] - -- name: grant heat demo role - os_user_role: - cloud: opnfv - user: demo - project: demo - role: heat_stack_owner - when: inventory_hostname == groups['controller'][0] - -- name: create member role - os_keystone_role: - cloud: opnfv - name: _member_ - when: inventory_hostname == groups['controller'][0] - -- name: update heat conf - template: src=heat.j2 - dest=/etc/heat/heat.conf - backup=yes - notify: - - restart heat service - - remove heat-sqlite-db diff --git a/deploy/adapters/ansible/roles/heat/tasks/main.yml b/deploy/adapters/ansible/roles/heat/tasks/main.yml deleted file mode 100644 index 8fe31c15..00000000 --- a/deploy/adapters/ansible/roles/heat/tasks/main.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 -############################################################################## ---- -- include: heat_install.yml - tags: - - install - - heat_install - - heat - -- include: heat_config.yml - when: inventory_hostname == groups['controller'][0] - tags: - - config - - heat_config - - heat - -- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/heat/templates/heat.j2 b/deploy/adapters/ansible/roles/heat/templates/heat.j2 deleted file mode 100644 index a8feb940..00000000 --- a/deploy/adapters/ansible/roles/heat/templates/heat.j2 +++ /dev/null @@ -1,58 +0,0 @@ -{% set memcached_servers = [] %} -{% for host in haproxy_hosts.values() %} -{% set _ = memcached_servers.append('%s:11211'% host) %} -{% endfor %} -{% set memcached_servers = memcached_servers|join(',') %} - -[DEFAULT] -heat_metadata_server_url = http://{{ internal_vip.ip }}:8000 -heat_waitcondition_server_url = http://{{ internal_vip.ip }}:8000/v1/waitcondition -rpc_backend = rabbit -log_dir = /var/log/heat -stack_domain_admin = heat_domain_admin -stack_domain_admin_password = {{ HEAT_PASS }} -stack_user_domain_name = heat -num_engine_workers = {{ api_workers}} - -[heat_api] -workers = {{ api_workers }} - -[database] -connection = mysql://heat:{{ HEAT_DBPASS }}@{{ db_host }}/heat -idle_timeout = 30 -use_db_reconnect = True -pool_timeout = 10 - -[ec2authtoken] -auth_uri = http://{{ internal_vip.ip }}:5000 - -[clients_keystone] -auth_uri = http://{{ internal_vip.ip }}:35357 - -[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 = heat -password = {{ HEAT_PASS }} - -identity_uri = http://{{ internal_vip.ip }}:35357 -admin_tenant_name = service -admin_user = heat -admin_password = {{ HEAT_PASS }} - -[oslo_messaging_rabbit] -rabbit_host = {{ rabbit_host }} -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} - -[trustee] -auth_type = password -auth_url = http://{{ internal_vip.ip }}:35357 -username = heat -password = {{ HEAT_PASS }} -user_domain_name = default diff --git a/deploy/adapters/ansible/roles/heat/vars/Debian.yml b/deploy/adapters/ansible/roles/heat/vars/Debian.yml deleted file mode 100644 index 4c978517..00000000 --- a/deploy/adapters/ansible/roles/heat/vars/Debian.yml +++ /dev/null @@ -1,19 +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: - - heat-api - - heat-api-cfn - - heat-engine - - python-heatclient - -services: - - heat-api - - heat-api-cfn - - heat-engine diff --git a/deploy/adapters/ansible/roles/heat/vars/RedHat.yml b/deploy/adapters/ansible/roles/heat/vars/RedHat.yml deleted file mode 100644 index 435afd3f..00000000 --- a/deploy/adapters/ansible/roles/heat/vars/RedHat.yml +++ /dev/null @@ -1,19 +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 -############################################################################## ---- -services: - - openstack-heat-api - - openstack-heat-api-cfn - - openstack-heat-engine - -packages: - - openstack-heat-api - - openstack-heat-api-cfn - - openstack-heat-engine - - python-heatclient diff --git a/deploy/adapters/ansible/roles/heat/vars/main.yml b/deploy/adapters/ansible/roles/heat/vars/main.yml deleted file mode 100644 index f6fef749..00000000 --- a/deploy/adapters/ansible/roles/heat/vars/main.yml +++ /dev/null @@ -1,12 +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_noarch: [] - -services_noarch: [] -- cgit 1.2.3-korg