aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/storage/tasks/main.yml
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-10-24 12:21:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-24 12:21:42 +0000
commitde2ba2c73205c2580f87a73fe7974ae8a8368093 (patch)
tree06bdbbd1b9e1f28faa1fa8a4819fd66b671224ca /deploy/adapters/ansible/roles/storage/tasks/main.yml
parent95ce514ef39a87f69956e08d6948291fce4b32c7 (diff)
parent660b8bfbb0546322f35f8c7f54d62e1bf5d5dd95 (diff)
Merge "bugfix"
Diffstat (limited to 'deploy/adapters/ansible/roles/storage/tasks/main.yml')
-rwxr-xr-xdeploy/adapters/ansible/roles/storage/tasks/main.yml66
1 files changed, 9 insertions, 57 deletions
diff --git a/deploy/adapters/ansible/roles/storage/tasks/main.yml b/deploy/adapters/ansible/roles/storage/tasks/main.yml
index 3d9635cc..e04019ae 100755
--- a/deploy/adapters/ansible/roles/storage/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/storage/tasks/main.yml
@@ -7,69 +7,21 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
-- name: check if physical device exists
- stat: path={{ physical_device }}
- register: status
- tags:
- - storage
-
-- name: load loop.yml
- include: loop.yml
- when: status.stat.exists == False or status.stat.isblk == False
- tags:
- - storage
-
-- name: load real.yml
- include: real.yml
- when: status.stat.exists == True and status.stat.isblk == True
- tags:
- - storage
-
-- name: make setup_storage directory
- file: path=/opt/setup_storage state=directory mode=0755
- tags:
- - storage
-
-- name: copy setup storage scripts
- copy: src={{ item }} dest=/opt/setup_storage mode=0755
- with_items:
- - losetup.sh
- tags:
- - storage
-
-- name: set autostart file
- copy: src=storage dest=/etc/init.d/storage mode=0755
- tags:
- - storage
-
-- name: set autostart file for centos
- copy:
- src: storage.service
- dest: /usr/lib/systemd/system/storage.service
- mode: 0755
- when: ansible_os_family == "RedHat"
- tags:
- - storage
-
-- name: add to boot scripts
- shell: update-rc.d storage defaults
- when: ansible_os_family == "Debian"
- tags:
- - storage
-
-- name: add to boot scripts
- shell: |
- chkconfig --add storage;
- chkconfig --level 2345 storage on;
- when: ansible_os_family == 'RedHat'
+- name: load storage.yml
+ include: storage.yml
+ when:
+ - hostvars[inventory_hostname]['groups']['ceph_mon'] is not defined
+ - hostvars[inventory_hostname]['groups']['ceph_osd'] is not defined
tags:
- storage
- name: load ceph.yml
include: ceph.yml
when:
- - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] |length > 0 }}"
- - "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}"
+ - hostvars[inventory_hostname]['groups']['ceph_mon'] is defined and
+ "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}"
+ - hostvars[inventory_hostname]['groups']['ceph_osd'] is defined and
+ "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}"
tags:
- storage