From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001
From: chigang <chigang@huawei.com>
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 <chigang@huawei.com>
---
 .../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 -------
 3 files changed, 109 deletions(-)
 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

(limited to 'deploy/adapters/ansible/roles/heat/tasks')

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
-- 
cgit 1.2.3-korg