From a5212af422149a2e0173419e6045fe1ebde2dca8 Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@tux.cs.princeton.edu>
Date: Sat, 10 Jan 2015 22:31:26 -0500
Subject: [PATCH] fix bugs

---
 .../openstack_observer/steps/__init__.py       | 12 ++++++------
 .../openstack_observer/steps/sync_slivers.py   |  4 ++--
 .../openstack_observer/steps/sync_slivers.yaml | 18 ------------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/planetstack/openstack_observer/steps/__init__.py b/planetstack/openstack_observer/steps/__init__.py
index 6eec315..c70b0c0 100644
--- a/planetstack/openstack_observer/steps/__init__.py
+++ b/planetstack/openstack_observer/steps/__init__.py
@@ -1,6 +1,6 @@
-from .sync_controller_sites import SyncControllerSites
-from .sync_controller_slices import SyncControllerSlices
-from .sync_controller_users import SyncControllerUsers
-from .sync_controller_site_privileges import SyncControllerSitePrivileges
-from .sync_controller_slice_privileges import SyncControllerSlicePrivileges
-from .sync_controller_networks import SyncControllerNetworks
+#from .sync_controller_sites import SyncControllerSites
+#from .sync_controller_slices import SyncControllerSlices
+#from .sync_controller_users import SyncControllerUsers
+#from .sync_controller_site_privileges import SyncControllerSitePrivileges
+#from .sync_controller_slice_privileges import SyncControllerSlicePrivileges
+#from .sync_controller_networks import SyncControllerNetworks
diff --git a/planetstack/openstack_observer/steps/sync_slivers.py b/planetstack/openstack_observer/steps/sync_slivers.py
index 8488b66..75b0b1e 100644
--- a/planetstack/openstack_observer/steps/sync_slivers.py
+++ b/planetstack/openstack_observer/steps/sync_slivers.py
@@ -104,8 +104,8 @@ class SyncSlivers(OpenStackSyncStep):
 
         controller = sliver.node.site_deployment.controller
         tenant_fields = {'endpoint':controller.auth_url,
-                     'admin_user': sliver.creator.username,
-                     'admin_password': sliver.creator.password,
+                     'admin_user': sliver.creator.email,
+                     'admin_password': sliver.creator.reomote_password,
                      'admin_tenant': sliver.slice.name,
                      'tenant': sliver.slice.name,
                      'tenant_description': sliver.slice.description,
diff --git a/planetstack/openstack_observer/steps/sync_slivers.yaml b/planetstack/openstack_observer/steps/sync_slivers.yaml
index 9ec5283..0cf30df 100644
--- a/planetstack/openstack_observer/steps/sync_slivers.yaml
+++ b/planetstack/openstack_observer/steps/sync_slivers.yaml
@@ -39,22 +39,4 @@
           {{ k }} : "{{ v }}"
       {% endfor %}
       {% endif %}
-      {% else %}
-      state: present
-      image_id: {{ image_id }}
-      key_name: {{ key_name }}
-      wait_for: 200
-      flavor_id: {{ flavor_id }}
-      user_data: "{{ user_data }}"
-      nics:
-      {% for net in nics %}  
-        - net-id: {{ net }}
-      {% endfor %}
-
-      {% if meta %}
-      meta:
-      {% for k,v in meta.items() %}  
-        {{ k }} : "{{ v }}"
-      {% endfor %}
-      {% endif %}
       {% endif %}
-- 
2.43.0