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/roles/glance | |
| parent | 78d1f808704a287cd2efb697c6af445280733c7f (diff) | |
| parent | faed52cdedf1b067c3f39d49827cb843d55edd45 (diff) | |
Merge "Add recovery scripts"
Diffstat (limited to 'deploy/adapters/ansible/roles/glance')
| -rw-r--r-- | deploy/adapters/ansible/roles/glance/tasks/main.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/glance/tasks/nfs.yml | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/glance/tasks/main.yml b/deploy/adapters/ansible/roles/glance/tasks/main.yml index a78ba771..caece26c 100644 --- a/deploy/adapters/ansible/roles/glance/tasks/main.yml +++ b/deploy/adapters/ansible/roles/glance/tasks/main.yml @@ -8,6 +8,8 @@ ############################################################################## --- - include_vars: "{{ ansible_os_family }}.yml" + tags: + - recovery - include: glance_install.yml tags: diff --git a/deploy/adapters/ansible/roles/glance/tasks/nfs.yml b/deploy/adapters/ansible/roles/glance/tasks/nfs.yml index 7895c386..179229de 100644 --- a/deploy/adapters/ansible/roles/glance/tasks/nfs.yml +++ b/deploy/adapters/ansible/roles/glance/tasks/nfs.yml @@ -38,10 +38,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 @@ -51,7 +55,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 |