diff options
author | Justin chi <chigang@huawei.com> | 2015-12-23 09:39:12 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-23 09:39:12 +0000 |
commit | 6447ed5fe06bba5b973ba673780235d33c909302 (patch) | |
tree | 70c7df960962e6ffd8043f938779c1b98641b904 /deploy/adapters/ansible/roles/cinder-volume/tasks | |
parent | 89a5321aa8d7981cc5422e72ba5827b710bac9ee (diff) | |
parent | ff1acb9305e5e13239a6ba7a30e99f8aa673514e (diff) |
Merge "cinder volume use the vg created by storage role"
Diffstat (limited to 'deploy/adapters/ansible/roles/cinder-volume/tasks')
3 files changed, 0 insertions, 42 deletions
diff --git a/deploy/adapters/ansible/roles/cinder-volume/tasks/loop.yml b/deploy/adapters/ansible/roles/cinder-volume/tasks/loop.yml deleted file mode 100644 index b44253c4..00000000 --- a/deploy/adapters/ansible/roles/cinder-volume/tasks/loop.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- include_vars: "{{ ansible_os_family }}.yml" - -- name: get available /var partition size - script: get_var_size.sh - register: part_size - -- name: create cinder file if not exitst - script: create_img.sh {{ part_size.stdout }} - -- name: do a losetup on /mnt/cinder-volumes - script: losetup.sh - register: loop_device - -- name: debug loop device - debug: msg={{ loop_device.stdout }} - -- name: create physical and group volumes - lvg: vg=cinder-volumes pvs={{ loop_device.stdout }} - vg_options=--force diff --git a/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml b/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml index 342f61ae..3765071e 100644 --- a/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml +++ b/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml @@ -9,18 +9,6 @@ lineinfile: dest=/opt/service create=yes line='{{ item }}' with_items: services | union(services_noarch) -- name: check if physical device exists - stat: path={{ physical_device }} - register: status - -- name: load loop.yml - include: loop.yml - when: status.stat.exists == False or status.stat.isblk == False - -- name: load real.yml - include: real.yml - when: status.stat.exists == True and status.stat.isblk == True - - name: upload cinder-volume configuration template: src=cinder.conf dest=/etc/cinder/cinder.conf backup=yes diff --git a/deploy/adapters/ansible/roles/cinder-volume/tasks/real.yml b/deploy/adapters/ansible/roles/cinder-volume/tasks/real.yml deleted file mode 100644 index 19ef828b..00000000 --- a/deploy/adapters/ansible/roles/cinder-volume/tasks/real.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- include_vars: "{{ ansible_os_family }}.yml" - -- name: destroy GPT lable - shell: dd if=/dev/urandom of={{ physical_device }} bs=4M count=1 - ignore_errors: True - -- name: create physical and group volumes - lvg: vg=cinder-volumes pvs={{ physical_device }} - vg_options=--force |