From 730b6cc8f82904489ca35064580f4b0276796c19 Mon Sep 17 00:00:00 2001
From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Fri, 19 Dec 2014 13:24:26 -0500
Subject: [PATCH] Fixed credentials in sync_slivers

---
 planetstack/openstack_observer/steps/sync_slivers.py  |  6 +++---
 .../openstack_observer/steps/sync_slivers.yaml        | 11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/planetstack/openstack_observer/steps/sync_slivers.py b/planetstack/openstack_observer/steps/sync_slivers.py
index 6c1398f..ef915d5 100644
--- a/planetstack/openstack_observer/steps/sync_slivers.py
+++ b/planetstack/openstack_observer/steps/sync_slivers.py
@@ -92,9 +92,9 @@ class SyncSlivers(OpenStackSyncStep):
 	    
 	sliver_name = '@'.join([sliver.slice.name,sliver.node.name])
 	tenant_fields = {'endpoint':sliver.node.controller.auth_url,
-		     'admin_user': sliver.node.controller.admin_user,
-		     'admin_password': sliver.node.controller.admin_password,
-		     'admin_tenant': 'admin',
+		     'admin_user': sliver.creator.username,
+		     'admin_password': sliver.creator.password,
+		     'admin_tenant': sliver.slice.name,
 		     'tenant': sliver.slice.name,
 		     'tenant_description': sliver.slice.description,
 		     'name':sliver_name,
diff --git a/planetstack/openstack_observer/steps/sync_slivers.yaml b/planetstack/openstack_observer/steps/sync_slivers.yaml
index 5f45d5c..79f550a 100644
--- a/planetstack/openstack_observer/steps/sync_slivers.yaml
+++ b/planetstack/openstack_observer/steps/sync_slivers.yaml
@@ -2,22 +2,28 @@
 - hosts: 127.0.0.1
   connection: local
   tasks:
+  {% if not delete %}
   - nova_keypair:
-       state: present
        auth_url: {{ endpoint }}
        login_username: {{ admin_user }}
        login_password: {{ admin_password }}
        login_tenant_name: {{ admin_tenant }}
        name: {{ key_name }}
+       state: present
        public_key: "{{ key.public_key}}"
+  {% endif %}
        
   - nova_compute:
-       state: present
        auth_url: {{ endpoint }}
        login_username: {{ admin_user }}
        login_password: {{ admin_password }}
        login_tenant_name: {{ admin_tenant }}
        name: {{ name }}
+
+       {% if delete %}
+       state: absent
+       {% else %}
+       state: present
        image_id: {{ image_id }}
        key_name: {{ key_name }}
        wait_for: 200
@@ -34,3 +40,4 @@
          {{ k }} : "{{ v }}"
        {% endfor %}
        {% endif %}
+       {% endif %}
-- 
2.47.0