+1 On 3 October 2016 at 17:00, Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> wrote: > Can I get any +1s? > > This has been sent upstream and merged, but wasn't in the latest update. > > > commit f8e4bcbe15d421141bcdfc72146fca604e2284ee > Author: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> > Date: Mon Oct 3 20:57:53 2016 +0000 > > Hotfix for nova_compute bug > > Signed-off-by: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> > > diff --git a/roles/ansible-server/files/4070.patch > b/roles/ansible-server/files/4070.patch > new file mode 100644 > index 0000000..b8e1956 > --- /dev/null > +++ b/roles/ansible-server/files/4070.patch > @@ -0,0 +1,40 @@ > +From bd065748a934b9c4261602ab5f1b975e5a441dd0 Mon Sep 17 00:00:00 2001 > +From: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> > +Date: Wed, 29 Jun 2016 12:59:23 +0000 > +Subject: [PATCH] nova_compute: indicate argument type > + > +Without this, ansible 2.1 will convert some arguments that are > +meant to be dict or list type to their str representation. > + > +Signed-off-by: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> > +--- > + cloud/openstack/_nova_compute.py | 10 +++++----- > + 1 file changed, 5 insertions(+), 5 deletions(-) > + > +diff --git a/cloud/openstack/_nova_compute.py > b/cloud/openstack/_nova_compute.py > +index 8b8545f..29d3ab0 100644 > +--- a/cloud/openstack/_nova_compute.py > ++++ b/cloud/openstack/_nova_compute.py > +@@ -543,17 +543,17 @@ def main(): > + flavor_include = dict(default=None), > + key_name = dict(default=None), > + security_groups = dict(default='default'), > +- nics = dict(default=None), > +- meta = dict(default=None), > ++ nics = dict(default=None, type='list'), > ++ meta = dict(default=None, type='dict'), > + wait = dict(default='yes', > choices=['yes', 'no']), > + wait_for = dict(default=180), > + state = dict(default='present', > choices=['absent', 'present']), > + user_data = dict(default=None), > + config_drive = dict(default=False, type='bool'), > + auto_floating_ip = dict(default=False, type='bool'), > +- floating_ips = dict(default=None), > +- floating_ip_pools = dict(default=None), > +- scheduler_hints = dict(default=None), > ++ floating_ips = dict(default=None, type='list'), > ++ floating_ip_pools = dict(default=None, type='list'), > ++ scheduler_hints = dict(default=None, type='dict'), > + )) > + module = AnsibleModule( > + argument_spec=argument_spec, > diff --git a/roles/ansible-server/tasks/main.yml > b/roles/ansible-server/tasks/main.yml > index f41d5ce..22a58f0 100644 > --- a/roles/ansible-server/tasks/main.yml > +++ b/roles/ansible-server/tasks/main.yml > @@ -20,6 +20,12 @@ > copy: src=dns_check.py dest=/usr/local/bin/dns_check owner=root mode=0755 > tags: > - ansible-server > + > +# https://github.com/ansible/ansible-modules-core/pull/4070 > +- name: Fix the nova_compute module > + patch: src=4070.patch > + dest=/usr/lib/python2.7/site-packages/ansible/modules/core/cloud/openstack/_nova_compute.py > +# > # > # TODO: > # cgit? > _______________________________________________ > infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx > To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx -- Stephen J Smoogen. _______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
