from planetstack.config import Config
from observer.openstacksyncstep import OpenStackSyncStep
from core.models.sliver import Sliver
-from core.models.slice import Slice, SlicePrivilege, SliceDeployments
-from core.models.network import Network, NetworkSlice, NetworkDeployments
+from core.models.slice import Slice, SlicePrivilege, ControllerSlice
+from core.models.network import Network, NetworkSlice, ControllerNetwork
from util.logger import Logger, logging
from observer.ansible import *
return userdata
def sync_record(self, sliver):
- logger.info("sync'ing sliver:%s slice:%s deployment:%s " % (sliver, sliver.slice.name, sliver.node.deployment))
+ logger.info("sync'ing sliver:%s slice:%s controller:%s " % (sliver, sliver.slice.name, sliver.node.site_deployment.controller))
metadata_update = {}
if (sliver.numberCores):
nics = []
networks = [ns.network for ns in NetworkSlice.objects.filter(slice=sliver.slice)]
- network_deployments = NetworkDeployments.objects.filter(network__in=networks,
- deployment=sliver.node.deployment)
+ controller_networks = ControllerNetwork.objects.filter(network__in=networks,
+ controller=sliver.node.site_deployment.controller)
- for network_deployment in network_deployments:
- if network_deployment.network.template.visibility == 'private' and \
- network_deployment.network.template.translation == 'none' and network_deployment.net_id:
- nics.append(network_deployment.net_id)
+ for controller_network in controller_networks:
+ if controller_network.network.template.visibility == 'private' and \
+ controller_network.network.template.translation == 'none' and controller_network.net_id:
+ nics.append(controller_network.net_id)
# now include network template
- network_templates = [network.template.sharedNetworkName for network in networks \
- if network.template.sharedNetworkName]
+ network_templates = [network.template.shared_network_name for network in networks \
+ if network.template.shared_network_name]
- #driver = self.driver.client_driver(caller=sliver.creator, tenant=sliver.slice.name, deployment=sliver.deploymentNetwork)
- driver = self.driver.admin_driver(tenant='admin', deployment=sliver.deploymentNetwork)
+ #driver = self.driver.client_driver(caller=sliver.creator, tenant=sliver.slice.name, controller=sliver.controllerNetwork)
+ driver = self.driver.admin_driver(tenant='admin', controller=sliver.node.site_deployment.controller)
nets = driver.shell.quantum.list_networks()['networks']
for net in nets:
if net['name'] in network_templates:
nics.append(net['id'])
# look up image id
- deployment_driver = self.driver.admin_driver(deployment=sliver.deploymentNetwork.name)
+ controller_driver = self.driver.admin_driver(controller=sliver.node.site_deployment.controller)
image_id = None
- images = deployment_driver.shell.glanceclient.images.list()
+ images = controller_driver.shell.glanceclient.images.list()
for image in images:
if image.name == sliver.image.name or not image_id:
image_id = image.id
- # look up key name at the deployment
+ # look up key name at the controller
# create/fetch keypair
keyname = None
keyname = sliver.creator.email.lower().replace('@', 'AT').replace('.', '') +\
key_fields = {'name': keyname,
'public_key': sliver.creator.public_key}
-
- userData = self.get_userdata(sliver)
- if sliver.userData:
- userData = sliver.userData
-
try:
legacy = Config().observer_legacy
except:
if (legacy):
host_filter = sliver.node.name.split('.',1)[0]
else:
- host_filter = sliver.node.name
+ host_filter = sliver.node.name.strip()
availability_zone_filter = 'nova:%s'%host_filter
- sliver_name = '@'.join([sliver.slice.name,sliver.node.name])
- tenant_fields = {'endpoint':sliver.node.deployment.auth_url,
- 'admin_user': sliver.node.deployment.admin_user,
- 'admin_password': sliver.node.deployment.admin_password,
- 'admin_tenant': 'admin',
+ sliver_name = '%s-%d'%(sliver.slice.name,sliver.id)
+
+ userData = self.get_userdata(sliver)
+ if sliver.userData:
+ userData = sliver.userData
+
+ controller = sliver.node.site_deployment.controller
+ tenant_fields = {'endpoint':controller.auth_url,
+ 'admin_user': sliver.creator.email,
+ 'admin_password': sliver.creator.remote_password,
+ 'admin_tenant': sliver.slice.name,
'tenant': sliver.slice.name,
- 'availability_zone': availability_zone_filter,
'tenant_description': sliver.slice.description,
'name':sliver_name,
'ansible_tag':sliver_name,
+ 'availability_zone': availability_zone_filter,
'image_id':image_id,
'key_name':keyname,
- 'flavor_id':3,
+ 'flavor_id':sliver.flavor.id,
'nics':nics,
'meta':metadata_update,
'key':key_fields,
'user_data':r'%s'%escape(userData)}
- res = run_template('sync_slivers.yaml', tenant_fields, path='slivers')
+ res = run_template('sync_slivers.yaml', tenant_fields,path='slivers')
if (len(res)!=2):
raise Exception('Could not sync sliver %s'%sliver.slice.name)
else:
- sliver_id = res[1]['id'] # 0 is for the key
+ sliver_id = res[1]['info']['OS-EXT-SRV-ATTR:instance_name'] # 0 is for the key
+ sliver_uuid = res[1]['id'] # 0 is for the key
+
+ try:
+ hostname = res[1]['info']['OS-EXT-SRV-ATTR:hypervisor_hostname']
+ ip = socket.gethostbyname(hostname)
+ sliver.ip = ip
+ except:
+ pass
sliver.instance_id = sliver_id
+ sliver.instance_uuid = sliver_uuid
sliver.instance_name = sliver_name
sliver.save()
'ansible_tag':sliver_name
}
res = run_template('delete_slivers.yaml', tenant_fields, path='slivers')
-
git://git.onelab.eu / plstackapi.git / blobdiff