diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-12-19 11:06:36 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2016-12-20 15:05:03 +0800 |
| commit | 819912d0379f6cd2b2693c2968576f7514a117c5 (patch) | |
| tree | e24d274484fa1ec8976c9f1bd44f5ee6e445724b /deploy/adapters/ansible/roles/ceph-openstack | |
| parent | eb5dbdac42b1b7b775fbc1dc513376425a6898ff (diff) | |
master only support newton
JIRA: COMPASS-513
Remove other roles and ppa, master only support newton.
Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/ceph-openstack')
3 files changed, 28 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_post.yml b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_post.yml new file mode 100644 index 00000000..2097ca57 --- /dev/null +++ b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_post.yml @@ -0,0 +1,19 @@ +############################################################################## +## 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: get mount info + command: mount + register: mount_info + +- name: try unmount image nfs directory + shell: | + umount /var/lib/glance/images + sed -i '/\/var\/lib\/glance\/images/d' /etc/fstab + when: mount_info.stdout.find('images') != -1 + diff --git a/deploy/adapters/ansible/roles/ceph-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/ceph-openstack/tasks/main.yml index 8c9734d7..06c3acb6 100644 --- a/deploy/adapters/ansible/roles/ceph-openstack/tasks/main.yml +++ b/deploy/adapters/ansible/roles/ceph-openstack/tasks/main.yml @@ -11,6 +11,7 @@ - ceph_deploy - ceph_openstack_pre - ceph_openstack_conf + - ceph_openstack_post - ceph_openstack - include: ceph_openstack_pre.yml @@ -24,3 +25,9 @@ - ceph_deploy - ceph_openstack_conf - ceph_openstack + +- include: ceph_openstack_post.yml + tags: + - ceph_deploy + - ceph_openstack_post + - ceph_openstack diff --git a/deploy/adapters/ansible/roles/ceph-openstack/vars/Debian.yml b/deploy/adapters/ansible/roles/ceph-openstack/vars/Debian.yml index 1da42323..db10bd14 100755 --- a/deploy/adapters/ansible/roles/ceph-openstack/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/ceph-openstack/vars/Debian.yml @@ -11,9 +11,9 @@ packages: - ceph-deploy - python-flask - libgoogle-perftools4 - - libleveldb1 + - libleveldb1v5 - liblttng-ust0 - - libsnappy1 + - libsnappy1v5 - librbd1 - librados2 - python-ceph |