From 75dfd63e807466465138d3a07fb82dd58590d2a6 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Thu, 4 Sep 2014 16:55:08 -0700 Subject: [PATCH] plumb flavors through to openstack --- planetstack/openstack/driver.py | 9 +++++---- planetstack/openstack_observer/steps/sync_slivers.py | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py index c3e1f35..4f1c177 100644 --- a/planetstack/openstack/driver.py +++ b/planetstack/openstack/driver.py @@ -417,11 +417,12 @@ class OpenStackDriver: return (subnet_id, subnet) - def spawn_instance(self, name, key_name=None, hostname=None, image_id=None, security_group=None, pubkeys=[], nics=None, metadata=None, userdata=None): - flavor_name = self.config.nova_default_flavor + def spawn_instance(self, name, key_name=None, hostname=None, image_id=None, security_group=None, pubkeys=[], nics=None, metadata=None, userdata=None, flavor_name=None): + if not flavor_name: + flavor_name = self.config.nova_default_flavor + flavor = self.shell.nova.flavors.find(name=flavor_name) - #if not image: - # image = self.config.nova_default_imave + if not security_group: security_group = self.config.nova_default_security_group diff --git a/planetstack/openstack_observer/steps/sync_slivers.py b/planetstack/openstack_observer/steps/sync_slivers.py index 299b02f..dcedd1d 100644 --- a/planetstack/openstack_observer/steps/sync_slivers.py +++ b/planetstack/openstack_observer/steps/sync_slivers.py @@ -86,7 +86,8 @@ class SyncSlivers(OpenStackSyncStep): hostname = sliver.node.name, pubkeys = pubkeys, nics = nics, - userdata = userData ) + userdata = userData, + flavor_name = sliver.flavor.flavor ) sliver.instance_id = instance.id sliver.instance_name = getattr(instance, 'OS-EXT-SRV-ATTR:instance_name') sliver.save() -- 2.43.0