CORD-1010 update ca certificates for openstack sync, remove sysctl tag support
Change-Id: Idd696966d9bc39c1f9984b0f6ac3a3a85371e952
diff --git a/xos/synchronizer/steps/sync_instances.py b/xos/synchronizer/steps/sync_instances.py
index c43498f..bb6c665 100644
--- a/xos/synchronizer/steps/sync_instances.py
+++ b/xos/synchronizer/steps/sync_instances.py
@@ -100,9 +100,10 @@
if (instance.numberCores):
metadata_update["cpu_cores"] = str(instance.numberCores)
- for tag in instance.slice.tags.all():
- if tag.name.startswith("sysctl-"):
- metadata_update[tag.name] = tag.value
+# not supported by API... assuming it's not used ... look into enabling later
+# for tag in instance.slice.tags.all():
+# if tag.name.startswith("sysctl-"):
+# metadata_update[tag.name] = tag.value
slice_memberships = SlicePrivilege.objects.filter(slice_id=instance.slice.id)
pubkeys = set([sm.user.public_key for sm in slice_memberships if sm.user.public_key])
@@ -195,6 +196,9 @@
if instance.userData:
userData += instance.userData
+ # make sure nics is pickle-able
+ sanitized_nics = [{"kind": nic["kind"], "value": nic["value"]} for nic in nics]
+
controller = instance.node.site_deployment.controller
fields = {'endpoint':controller.auth_url,
'endpoint_v3': controller.auth_url_v3,
@@ -209,7 +213,7 @@
'availability_zone': availability_zone_filter,
'image_name':image_name,
'flavor_name':instance.flavor.name,
- 'nics':nics,
+ 'nics':sanitized_nics,
'meta':metadata_update,
'user_data':r'%s'%escape(userData)}
return fields