X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack%2Fdriver.py;h=2edf10ea24d0c84156c511758c349ad08ec64755;hb=90ecab134bf44662886576bea76c48d0aea316b7;hp=5b8e7289be570b60a5602532349d15df84921d2e;hpb=628caa3c178c90b99151b54aed1449eee936cd3a;p=plstackapi.git diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py index 5b8e728..2edf10e 100644 --- a/planetstack/openstack/driver.py +++ b/planetstack/openstack/driver.py @@ -1,6 +1,7 @@ import commands import hashlib from planetstack.config import Config +from core.models import Controller try: from openstack.client import OpenStackClient @@ -12,46 +13,52 @@ manager_enabled = Config().api_nova_enabled class OpenStackDriver: - def __init__(self, config = None, client=None, deployment=None): + def __init__(self, config = None, client=None): if config: self.config = Config(config) else: self.config = Config() - self.admin_client = OpenStackClient(deployment=deployment) - self.admin_user = self.admin_client.keystone.users.find(name=self.admin_client.keystone.username) - if client: self.shell = client - else: - self.shell = OpenStackClient(deployment=deployment) self.enabled = manager_enabled self.has_openstack = has_openstack + self.controller = None + self.admin_user = None - def client_driver(self, caller=None, tenant=None, deployment=None): + def client_driver(self, caller=None, tenant=None, controller=None): if caller: auth = {'username': caller.email, 'password': hashlib.md5(caller.password).hexdigest()[:6], 'tenant': tenant} - client = OpenStackClient(deployment=deployment, **auth) + client = OpenStackClient(controller=controller, cacert=self.config.nova_ca_ssl_cert, **auth) else: - client = OpenStackClient(tenant=tenant, deployment=deployment) + admin_driver = self.admin_driver(tenant=tenant, controller=controller) + client = OpenStackClient(tenant=tenant, controller=admin_driver.controller) - driver = OpenStackDriver(client=client, deployment=deployment) + driver = OpenStackDriver(client=client) + #driver.admin_user = admin_driver.admin_user + #driver.controller = admin_driver.controller return driver - def admin_driver(self, tenant=None, deployment=None): - client = OpenStackClient(tenant=tenant, deployment=deployment) - driver = OpenStackDriver(client=client, deployment=deployment) + def admin_driver(self, tenant=None, controller=None): + if isinstance(controller, int): + controller = Controller.objects.get(id=controller.id) + client = OpenStackClient(tenant=tenant, controller=controller, cacert=self.config.nova_ca_ssl_cert) + driver = OpenStackDriver(client=client) + driver.admin_user = client.keystone.users.find(name=controller.admin_user) + driver.controller = controller return driver def create_role(self, name): roles = self.shell.keystone.roles.findall(name=name) - if not roles: + roles_title = self.shell.keystone.roles.findall(name=name.title()) + roles_found = roles + roles_title + if not roles_found: role = self.shell.keystone.roles.create(name) else: - role = roles[0] + role = roles_found[0] return role def delete_role(self, filter): @@ -261,17 +268,21 @@ class OpenStackDriver: subnet = snet if not subnet: + # HACK: Add metadata route -- Neutron does not reliably supply this + metadata_ip = cidr_ip.replace("0/24", "3") + allocation_pools = [{'start': start, 'end': end}] subnet = {'subnet': {'name': name, 'network_id': network_id, 'ip_version': ip_version, 'cidr': cidr_ip, - 'dns_nameservers': ['8.8.8.8', '8.8.4.4'], + #'dns_nameservers': ['8.8.8.8', '8.8.4.4'], + 'host_routes': [{'destination':'169.254.169.254/32','nexthop':metadata_ip}], + 'gateway_ip': None, 'allocation_pools': allocation_pools}} subnet = self.shell.quantum.create_subnet(subnet)['subnet'] - self.add_external_route(subnet) - # TODO: Add route to external network - # e.g. # route add -net 10.0.3.0/24 dev br-ex gw 10.100.0.5 + # self.add_external_route(subnet) + return subnet def update_subnet(self, id, fields): @@ -407,36 +418,42 @@ 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): - flavor_name = self.config.nova_default_flavor + def spawn_instance(self, name, key_name=None, availability_zone=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 - personality = [] - if pubkeys: - personality.append({ - 'path': '/root/.ssh/authorized_keys', - 'contents':"\n".join(pubkeys), - }) + files = {} + #if pubkeys: + # files["/root/.ssh/authorized_keys"] = "\n".join(pubkeys).encode('base64') hints = {} - availability_zone = None + + # determine availability zone and compute host + availability_zone_filter = None + if availability_zone is None or not availability_zone: + availability_zone_filter = 'nova' + else: + availability_zone_filter = availability_zone if hostname: - availability_zone = 'nova:%s' % hostname.split('.')[0] + availability_zone_filter += ':%s' % hostname + server = self.shell.nova.servers.create( name=name, key_name = key_name, flavor=flavor.id, image=image_id, security_group = security_group, - personality = personality, + #files = files, scheduler_hints=hints, - availability_zone=availability_zone, + availability_zone=availability_zone_filter, nics=nics, networks=nics, - meta=metadata) + meta=metadata, + userdata=userdata) return server def destroy_instance(self, id):