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>
---
 .../roles/neutron-controller/tasks/main.yml        | 31 -------------
 .../neutron-controller/tasks/neutron_config.yml    | 21 ---------
 .../neutron-controller/tasks/neutron_install.yml   | 52 ----------------------
 3 files changed, 104 deletions(-)
 delete mode 100644 deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
 delete mode 100644 deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
 delete mode 100644 deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml

(limited to 'deploy/adapters/ansible/roles/neutron-controller/tasks')

diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
deleted file mode 100644
index 018bea9a..00000000
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
+++ /dev/null
@@ -1,31 +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: neutron_install.yml
-  tags:
-    - install
-    - neutron_install
-    - neutron
-
-- include: neutron_config.yml
-  when: inventory_hostname == groups['controller'][0]
-  tags:
-    - config
-    - neutron_config
-    - neutron
-
-- name: restart first neutron-server
-  service: name=neutron-server state=restarted enabled=yes
-  when: inventory_hostname == groups['controller'][0]
-
-- name: restart other neutron-server
-  service: name=neutron-server state=restarted enabled=yes
-  when: inventory_hostname != groups['controller'][0]
-
-- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
deleted file mode 100644
index 6953a17b..00000000
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.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
-##############################################################################
----
-
-- name: neutron-db-manage upgrade
-  shell: |
-    neutron-db-manage --config-file=/etc/neutron/neutron.conf \
-        --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
-  register: result
-  run_once: "True"
-  until: result.rc == 0
-  retries: 10
-  delay: 5
-  notify:
-    - restart neutron control services
diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml
deleted file mode 100644
index 63a80fa4..00000000
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml
+++ /dev/null
@@ -1,52 +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: disable auto start
-  copy:
-    content: "#!/bin/sh\nexit 101"
-    dest: "/usr/sbin/policy-rc.d"
-    mode: 0755
-  when: ansible_os_family == "Debian"
-
-- name: install controller-related neutron packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: "{{ packages | union(packages_noarch) }}"
-
-- name: enable auto start
-  file:
-    path=/usr/sbin/policy-rc.d
-    state=absent
-  when: ansible_os_family == "Debian"
-
-- name: generate neutron control service list
-  lineinfile: dest=/opt/service create=yes line='{{ item }}'
-  with_items: "{{ services | union(services_noarch) }}"
-
-- name: get tenant id to fill neutron.conf
-  shell:
-    . /opt/admin-openrc.sh;
-    openstack project show service | grep id | sed -n "2,1p" | awk '{print $4}'
-  register: NOVA_ADMIN_TENANT_ID
-
-- name: update neutron conf
-  template: src=templates/neutron.conf dest=/etc/neutron/neutron.conf backup=yes
-
-- name: update ml2 plugin conf
-  template:
-    src: templates/ml2_conf.ini
-    dest: /etc/neutron/plugins/ml2/ml2_conf.ini
-    backup: "yes"
-
-- name: ln plugin.ini
-  file:
-    src: /etc/neutron/plugins/ml2/ml2_conf.ini
-    dest: /etc/neutron/plugin.ini
-    state: link
-- 
cgit 1.2.3-korg