From d01d50b392e751ac1f100094648e4eb1a174f308 Mon Sep 17 00:00:00 2001
From: John Hua <john.hua@citrix.com>
Date: Thu, 30 Jul 2015 17:03:06 +0800
Subject: [PATCH] Move textfield back to plugin

---
 .../compute_post_deployment.py                   |  6 +++---
 xenserver-fuel-plugin/environment_config.yaml    | 13 +++++++++++++
 xs_release.yaml                                  | 16 ----------------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/xenserver-fuel-plugin/deployment_scripts/compute_post_deployment.py b/xenserver-fuel-plugin/deployment_scripts/compute_post_deployment.py
index 6c8501d..6d9f645 100755
--- a/xenserver-fuel-plugin/deployment_scripts/compute_post_deployment.py
+++ b/xenserver-fuel-plugin/deployment_scripts/compute_post_deployment.py
@@ -10,7 +10,7 @@ from tempfile import mkstemp, mkdtemp
 
 LOG_FILE = '/tmp/compute_post_deployment.log'
 ASTUTE_PATH = '/etc/astute.yaml'
-ACCESS_SECTION = 'xenserver_access'
+ACCESS_SECTION = 'xen-fuel-plugin'
 XENAPI_URL = 'https://pypi.python.org/packages/source/X/XenAPI/XenAPI-1.2.tar.gz'
 
 logging.basicConfig(filename=LOG_FILE,level=logging.DEBUG)
@@ -26,7 +26,7 @@ def get_access(astute_path, access_section):
 		return None
 
 	access = astute[access_section]
-	info('username: {user}'.format(**access))
+	info('username: {username}'.format(**access))
 	info('password: {password}'.format(**access))
 	return access
 
@@ -71,7 +71,7 @@ def create_novacompute_conf(access):
 compute_driver=xenapi.XenAPIDriver
 [xenserver]
 connection_url=http://169.254.0.1
-connection_username={user}
+connection_username={username}
 connection_password={password}
 """
 	s = template.format(**access)
diff --git a/xenserver-fuel-plugin/environment_config.yaml b/xenserver-fuel-plugin/environment_config.yaml
index e69de29..13cc338 100644
--- a/xenserver-fuel-plugin/environment_config.yaml
+++ b/xenserver-fuel-plugin/environment_config.yaml
@@ -0,0 +1,13 @@
+attributes:
+  username:
+    value: 'root'
+    label: 'Username'
+    description: ''
+    weight: 25
+    type: "text"
+  password:
+    value: ''
+    label: 'Password'
+    description: ''
+    weight: 25
+    type: "text"
\ No newline at end of file
diff --git a/xs_release.yaml b/xs_release.yaml
index ce006e5..d160c8c 100644
--- a/xs_release.yaml
+++ b/xs_release.yaml
@@ -100,22 +100,6 @@
         kernel_params:
           kernel:
             value: "console=ttyS0,9600 console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset"
-        xenserver_access:
-          metadata:
-            label: "Xenserver Access"
-            weight: 10
-          user:
-            value: "root"
-            label: "Username"
-            description: "Username for Xenserver"
-            weight: 10
-            type: "text"
-          password:
-            value: ""
-            label: "Password"
-            description: "Password for Xenserver"
-            weight: 20
-            type: "password"
         repo_setup:
           metadata:
             label: "Repositories"