From 2729f700bf4ad009d68f43c5a99e1489e92f07c7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 23 Jun 2016 21:23:34 +0000 Subject: [PATCH] try this and see if it fixes volume handling in new ansible --- master.yml | 36 ++++++++++++++++++------------------ tasks/persistent_cloud.yml | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/master.yml b/master.yml index 250dd79c22..10b7e0a9ec 100644 --- a/master.yml +++ b/master.yml @@ -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 diff --git a/tasks/persistent_cloud.yml b/tasks/persistent_cloud.yml index c4ae2f1035..8ca5a5c688 100644 --- a/tasks/persistent_cloud.yml +++ b/tasks/persistent_cloud.yml @@ -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