From 86eae491584074bdbf738f5ea100e54385e1e892 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 5 May 2017 20:13:04 +0000 Subject: [PATCH] fix flavor and nic handling for servers Include the flavor by name for now. Fix the format of the nics value to be a list of mappings of net-name to the actual names. Change-Id: I446fa56ad54885fc1b95322c93a3572174ff134c Signed-off-by: Doug Hellmann --- downpour/resolver.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/downpour/resolver.py b/downpour/resolver.py index acc115f..c9300e2 100644 --- a/downpour/resolver.py +++ b/downpour/resolver.py @@ -241,18 +241,33 @@ class Resolver: image = self.cloud.get_image(server.image.id) yield from self.image(image) + flavor = self.cloud.get_flavor(server.flavor.id) + server_data = { 'name': server.name, 'state': 'present', - # Attach to the networks by name. - 'nics': list(server.networks.keys()), 'image': image.name, + # FIXME(dhellmann): Need to be more flexible about + # specifying the flavor. Input parameter? Use RAM? Use + # flavor_include? + 'flavor': flavor.name, + # 'flavor_ram': flavor.ram, } + key_name = key_name or server.key_name if key_name: server_data['key_name'] = key_name + if vol_names: server_data['volumes'] = vol_names + + # Attach to the networks by name. + nics = [] + for n in server.networks.keys(): + nics.append({'net-name': n}) + if nics: + server_data['nics'] = nics + yield { 'name': 'Creating server {}'.format(server.name), 'os_server': server_data,