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 --- .../ansible/roles/compute-recovery/tasks/main.yml | 25 ---------------------- .../ansible/roles/compute-recovery/vars/Debian.yml | 14 ------------ .../ansible/roles/compute-recovery/vars/RedHat.yml | 14 ------------ .../ansible/roles/compute-recovery/vars/main.yml | 10 --------- 4 files changed, 63 deletions(-) delete mode 100644 deploy/adapters/ansible/roles/compute-recovery/tasks/main.yml delete mode 100644 deploy/adapters/ansible/roles/compute-recovery/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/roles/compute-recovery/vars/RedHat.yml delete mode 100644 deploy/adapters/ansible/roles/compute-recovery/vars/main.yml (limited to 'deploy/adapters/ansible/roles/compute-recovery') diff --git a/deploy/adapters/ansible/roles/compute-recovery/tasks/main.yml b/deploy/adapters/ansible/roles/compute-recovery/tasks/main.yml deleted file mode 100644 index 23b4a948..00000000 --- a/deploy/adapters/ansible/roles/compute-recovery/tasks/main.yml +++ /dev/null @@ -1,25 +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: Register RECOVERY - set_fact: RECOVERY_ENV={{RECOVERY_ENV | default('False')}} - tags: - - recovery - -- include_vars: "{{ ansible_os_family }}.yml" - when: RECOVERY_ENV - tags: - - recovery - -- name: restart compute services - service: name={{ item }} state=restarted enabled=yes - with_items: "{{ compute_services | union(compute_services_noarch) }}" - when: RECOVERY_ENV - tags: - - recovery diff --git a/deploy/adapters/ansible/roles/compute-recovery/vars/Debian.yml b/deploy/adapters/ansible/roles/compute-recovery/vars/Debian.yml deleted file mode 100644 index 4e843d03..00000000 --- a/deploy/adapters/ansible/roles/compute-recovery/vars/Debian.yml +++ /dev/null @@ -1,14 +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 -############################################################################## ---- -compute_services: - - nova-compute - - neutron-openvswitch-agent - - cinder-volume - - ceilometer-agent-compute diff --git a/deploy/adapters/ansible/roles/compute-recovery/vars/RedHat.yml b/deploy/adapters/ansible/roles/compute-recovery/vars/RedHat.yml deleted file mode 100644 index 7b9488f8..00000000 --- a/deploy/adapters/ansible/roles/compute-recovery/vars/RedHat.yml +++ /dev/null @@ -1,14 +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 -############################################################################## ---- -compute_services: - - openstack-nova-compute - - neutron-openvswitch-agent - - openstack-cinder-volume - - openstack-ceilometer-compute diff --git a/deploy/adapters/ansible/roles/compute-recovery/vars/main.yml b/deploy/adapters/ansible/roles/compute-recovery/vars/main.yml deleted file mode 100644 index c2c0d8ee..00000000 --- a/deploy/adapters/ansible/roles/compute-recovery/vars/main.yml +++ /dev/null @@ -1,10 +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 -############################################################################## ---- -compute_services_noarch: [] -- cgit 1.2.3-korg