diff options
author | Justin chi <chigang@huawei.com> | 2016-10-16 04:27:54 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2016-10-16 04:27:54 +0000 |
commit | 38a7d02dae6715520071edbd635e0d2085263399 (patch) | |
tree | 1b6d41907af4577dfb6073a0c727fa1af704eee6 /deploy/adapters/ansible/openstack_mitaka_xenial | |
parent | 78d1f808704a287cd2efb697c6af445280733c7f (diff) | |
parent | faed52cdedf1b067c3f39d49827cb843d55edd45 (diff) |
Merge "Add recovery scripts"
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial')
-rw-r--r-- | deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml | 7 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack_mitaka_xenial/roles/glance/tasks/nfs.yml | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml index ec4c53f4..ac31b682 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml @@ -247,6 +247,13 @@ accelerate: true max_fail_percentage: 0 roles: + - boot-recovery + +- hosts: controller + remote_user: root + accelerate: true + max_fail_percentage: 0 + roles: - controller-recovery - hosts: compute diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/glance/tasks/nfs.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/glance/tasks/nfs.yml index 07dfacdd..deec81f8 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/glance/tasks/nfs.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/glance/tasks/nfs.yml @@ -42,10 +42,14 @@ - name: get mount info command: mount register: mount_info + tags: + - recovery - name: get nfs server shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf register: ip_info + tags: + - recovery - name: restart host nfs service service: name={{ item }} state=restarted enabled=yes @@ -55,7 +59,9 @@ shell: | mount -t nfs -onfsvers=3 {{ ip_info.stdout_lines[0] }}:/opt/images /var/lib/glance/images sed -i '/\/var\/lib\/glance\/images/d' /etc/fstab - echo {{ ip_info.stdout_lines[0] }}:/opt/images /var/lib/glance/images/ nfs nfsvers=3 >> /etc/fstab + #echo {{ ip_info.stdout_lines[0] }}:/opt/images /var/lib/glance/images/ nfs nfsvers=3 >> /etc/fstab when: mount_info.stdout.find('images') == -1 retries: 5 delay: 3 + tags: + - recovery |