try this and see if it fixes volume handling in new ansible

This commit is contained in:
Kevin Fenzi 2016-06-23 21:23:34 +00:00
parent d0fa57a8a6
commit 2729f700bf
2 changed files with 19 additions and 19 deletions

View file

@ -12,24 +12,24 @@
#
# group playbooks
#
- include: /srv/web/infra/ansible/playbooks/groups/anitya.yml
- include: /srv/web/infra/ansible/playbooks/groups/arm-packager.yml
- include: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml
- include: /srv/web/infra/ansible/playbooks/groups/ask.yml
- include: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml
- include: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml
- include: /srv/web/infra/ansible/playbooks/groups/autosign.yml
- include: /srv/web/infra/ansible/playbooks/groups/backup-server.yml
- include: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml
- include: /srv/web/infra/ansible/playbooks/groups/badges-web.yml
- include: /srv/web/infra/ansible/playbooks/groups/basset.yml
- include: /srv/web/infra/ansible/playbooks/groups/bastion.yml
- include: /srv/web/infra/ansible/playbooks/groups/batcave.yml
- include: /srv/web/infra/ansible/playbooks/groups/beaker.yml
- include: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml
- include: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml
- include: /srv/web/infra/ansible/playbooks/groups/bodhi2.yml
- include: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml
#- include: /srv/web/infra/ansible/playbooks/groups/anitya.yml
#- include: /srv/web/infra/ansible/playbooks/groups/arm-packager.yml
#- include: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml
#- include: /srv/web/infra/ansible/playbooks/groups/ask.yml
#- include: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml
#- include: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml
#- include: /srv/web/infra/ansible/playbooks/groups/autosign.yml
#- include: /srv/web/infra/ansible/playbooks/groups/backup-server.yml
#- include: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml
#- include: /srv/web/infra/ansible/playbooks/groups/badges-web.yml
#- include: /srv/web/infra/ansible/playbooks/groups/basset.yml
#- include: /srv/web/infra/ansible/playbooks/groups/bastion.yml
#- include: /srv/web/infra/ansible/playbooks/groups/batcave.yml
#- include: /srv/web/infra/ansible/playbooks/groups/beaker.yml
#- include: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml
#- include: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml
#- include: /srv/web/infra/ansible/playbooks/groups/bodhi2.yml
#- include: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml
- include: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml
- include: /srv/web/infra/ansible/playbooks/groups/buildhw.yml
- include: /srv/web/infra/ansible/playbooks/groups/buildvm.yml

View file

@ -45,7 +45,7 @@
# instance can be both id and name, volume must be id
# volume must be id
- local_action: shell nova --os-auth-url="{{os_auth_url}}" --os-username="admin" --os-password="{{ADMIN_PASS}}" --os-tenant-name={{inventory_tenant}} volume-list | grep ' {{item.volume_id}} ' | grep 'available' && nova --os-auth-url="{{os_auth_url}}" --os-username="admin" --os-password="{{ADMIN_PASS}}" --os-tenant-name={{inventory_tenant}} volume-attach "{{inventory_instance_name}}" "{{item.volume_id}}" "{{item.device}}"
with_items: volumes
with_items: "{{volumes}}"
ignore_errors: yes
when: volumes is defined