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 --- .../roles/controller-recovery/tasks/main.yml | 25 -------------- .../roles/controller-recovery/vars/Debian.yml | 40 ---------------------- .../roles/controller-recovery/vars/RedHat.yml | 39 --------------------- .../roles/controller-recovery/vars/main.yml | 10 ------ 4 files changed, 114 deletions(-) delete mode 100644 deploy/adapters/ansible/roles/controller-recovery/tasks/main.yml delete mode 100644 deploy/adapters/ansible/roles/controller-recovery/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/roles/controller-recovery/vars/RedHat.yml delete mode 100644 deploy/adapters/ansible/roles/controller-recovery/vars/main.yml (limited to 'deploy/adapters/ansible/roles/controller-recovery') diff --git a/deploy/adapters/ansible/roles/controller-recovery/tasks/main.yml b/deploy/adapters/ansible/roles/controller-recovery/tasks/main.yml deleted file mode 100644 index eb7c4309..00000000 --- a/deploy/adapters/ansible/roles/controller-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 controller services - service: name={{ item }} state=restarted enabled=yes - with_items: "{{ controller_services | union(controller_services_noarch) }}" - when: RECOVERY_ENV - tags: - - recovery diff --git a/deploy/adapters/ansible/roles/controller-recovery/vars/Debian.yml b/deploy/adapters/ansible/roles/controller-recovery/vars/Debian.yml deleted file mode 100644 index 730ce830..00000000 --- a/deploy/adapters/ansible/roles/controller-recovery/vars/Debian.yml +++ /dev/null @@ -1,40 +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 -############################################################################## ---- -controller_services: - - keepalived - - apache2 - - nova-api - - nova-cert - - nova-conductor - - nova-consoleauth - - nova-novncproxy - - nova-scheduler - - neutron-server - - cinder-api - - cinder-scheduler - - glance-registry - - glance-api - - openvswitch-switch - - neutron-openvswitch-agent - - neutron-l3-agent - - neutron-dhcp-agent - - neutron-metadata-agent - - ceilometer-agent-central - - ceilometer-agent-notification - - ceilometer-api - - ceilometer-collector - - heat-api - - heat-api-cfn - - heat-engine - - aodh-api - - aodh-notifier - - aodh-evaluator - - aodh-listener - - cron diff --git a/deploy/adapters/ansible/roles/controller-recovery/vars/RedHat.yml b/deploy/adapters/ansible/roles/controller-recovery/vars/RedHat.yml deleted file mode 100644 index 75a69e7d..00000000 --- a/deploy/adapters/ansible/roles/controller-recovery/vars/RedHat.yml +++ /dev/null @@ -1,39 +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 -############################################################################## ---- -controller_services: - - keepalived - - httpd - - openstack-nova-api - - openstack-nova-cert - - openstack-nova-conductor - - openstack-nova-consoleauth - - openstack-nova-novncproxy - - openstack-nova-scheduler - - neutron-server - - openstack-cinder-api - - openstack-cinder-scheduler - - openstack-glance-api - - openstack-glance-registry - - neutron-openvswitch-agent - - neutron-l3-agent - - neutron-dhcp-agent - - neutron-metadata-agent - - openstack-ceilometer-central - - openstack-ceilometer-notification - - openstack-ceilometer-api - - openstack-ceilometer-collector - - openstack-heat-api - - openstack-heat-api-cfn - - openstack-heat-engine - - openstack-aodh-api - - openstack-aodh-notifier - - openstack-aodh-evaluator - - openstack-aodh-listener - - cron diff --git a/deploy/adapters/ansible/roles/controller-recovery/vars/main.yml b/deploy/adapters/ansible/roles/controller-recovery/vars/main.yml deleted file mode 100644 index 89c1e8f0..00000000 --- a/deploy/adapters/ansible/roles/controller-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 -############################################################################## ---- -controller_services_noarch: [] -- cgit 1.2.3-korg