From dd7788422ce811c2bd0863212fd400064ad8bf5e Mon Sep 17 00:00:00 2001 From: QiLiang Date: Sun, 28 Aug 2016 13:06:12 +0800 Subject: Add controller and compute recovery roles After all hosts system restart, login to the compass-core, change directory /var/ansible/run/ and execute below command: ansible-playbook \ -i inventories/inventory.yml HA-ansible-multinodes.yml \ -t recovery \ -e "RECOVERY_ENV=True" JIRA: COMPASS-474 Change-Id: I2ed80550c043b14643382609c48d724019cc1cfb Signed-off-by: QiLiang (cherry picked from commit a894d5924182e0466f5466e66b6111076d992500) --- .../ansible/roles/compute-recovery/tasks/main.yml | 26 ++++++++++++++++++++++ .../ansible/roles/compute-recovery/vars/Debian.yml | 15 +++++++++++++ .../ansible/roles/compute-recovery/vars/RedHat.yml | 15 +++++++++++++ .../ansible/roles/compute-recovery/vars/main.yml | 10 +++++++++ 4 files changed, 66 insertions(+) create mode 100644 deploy/adapters/ansible/roles/compute-recovery/tasks/main.yml create mode 100644 deploy/adapters/ansible/roles/compute-recovery/vars/Debian.yml create mode 100644 deploy/adapters/ansible/roles/compute-recovery/vars/RedHat.yml create 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 new file mode 100644 index 00000000..b333b9e0 --- /dev/null +++ b/deploy/adapters/ansible/roles/compute-recovery/tasks/main.yml @@ -0,0 +1,26 @@ +############################################################################## +# 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 new file mode 100644 index 00000000..23200a50 --- /dev/null +++ b/deploy/adapters/ansible/roles/compute-recovery/vars/Debian.yml @@ -0,0 +1,15 @@ +############################################################################## +# 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 new file mode 100644 index 00000000..c96b062a --- /dev/null +++ b/deploy/adapters/ansible/roles/compute-recovery/vars/RedHat.yml @@ -0,0 +1,15 @@ +############################################################################## +# 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 new file mode 100644 index 00000000..c2c0d8ee --- /dev/null +++ b/deploy/adapters/ansible/roles/compute-recovery/vars/main.yml @@ -0,0 +1,10 @@ +############################################################################## +# 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