From e5d8576cfd596b1fcfff11a1ba86261a8165d143 Mon Sep 17 00:00:00 2001
From: ligc <liguangc@cn.ibm.com>
Date: Fri, 18 Oct 2013 15:53:10 +0800
Subject: [PATCH] Update Clouds table for xCAT-OpenStack

---
 xCAT-OpenStack/lib/perl/xCAT_schema/Clouds.pm | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 xCAT-OpenStack/lib/perl/xCAT_schema/Clouds.pm

diff --git a/xCAT-OpenStack/lib/perl/xCAT_schema/Clouds.pm b/xCAT-OpenStack/lib/perl/xCAT_schema/Clouds.pm
old mode 100644
new mode 100755
index 9ab878a44..b14cc0212
--- a/xCAT-OpenStack/lib/perl/xCAT_schema/Clouds.pm
+++ b/xCAT-OpenStack/lib/perl/xCAT_schema/Clouds.pm
@@ -8,19 +8,19 @@ package xCAT_schema::Clouds;
 ################################################################################
 %tabspec = (
     clouds => {      
-	cols => [qw(name controller publicnet novanet mgtnet vmnet adminpw dbpwcomments disable)],  #do not change 'disable' and 'comments', it is required by xCAT
+	cols => [qw(name controller hostip pubinterface mgtinterface datainterface template repository virttype comments disable)],  #do not change 'disable' and 'comments', it is required by xCAT
 	keys => [qw(name)],
         required => [qw(name)],
 	table_desc => 'OpenStack clouds managed by this xCAT cluster',
 	descriptions => {
-	    name => 'The name of this cloud',
 	    controller => 'The xCAT node name of the controller node',
-	    publicnet => 'The name of the network in the xCAT networks table to be used for the OpenStack public network',
-	    novanet => 'The name of the network in the xCAT networks table to be used for the OpenStack Nova network',
-	    mgtnet => 'The name of the network in the xCAT networks table to be used for the OpenStack management network',
-	    vmnet => 'The name of the network in the xCAT networks table to be used for the OpenStack virtual machine network',
-	    adminpw => 'The administrative password',
-	    dbpw => 'The database password',
+	    hostip => 'The host IP is in openstack management network on the controller node. It is always the rabbitmq host IP and nova_metadata_ip.',
+	    pubinterface => 'Interface to use for external bridge. The default value is eth1.',
+	    mgtinterface => 'Interface to use for openstack management. It is supposed that the mgtinterface for all the nodes are the same, and in the same network.',
+	    datainterface => 'Interface to use for OpenStack nova vm communication. It is supposed that the datainterface for all the nodes are the same, and in the same network.',
+	    template => 'Every cloud should be related to one environment template file. The absolute path is required.',
+	    repository => 'Every could should be related to the openstack-chef-cookbooks. The absolute path is required. In the repository, there are cookbooks, environments, roles and on on.',
+            virttype => 'What hypervisor software layer to use with libvirt (e.g., kvm, qemu).',
 	    comments => 'Any user-written notes.',
 	    disable => "Set to 'yes' or '1' to comment out this row.",
 	},
@@ -60,37 +60,41 @@ package xCAT_schema::Clouds;
 @{$defspec{cloud}->{'attrs'}} = 
 (
     {   attr_name => 'name',
-	tabentry => 'clouds.name',
-	access_tabentry => 'clouds.name=attr:name',
+        tabentry => 'clouds.name',
+        access_tabentry => 'clouds.name=attr:name',
     },
     {   attr_name => 'controller',
 	tabentry => 'clouds.controller',
 	access_tabentry => 'clouds.name=attr:name',
     },
-    {   attr_name => 'publicnet',
-	tabentry => 'clouds.publicnet',
+    {   attr_name => 'hostip',
+	tabentry => 'clouds.hostip',
 	access_tabentry => 'clouds.name=attr:name',
     },
-    {   attr_name => 'novanet',
-	tabentry => 'clouds.novanet',
+    {   attr_name => 'pubinterface',
+	tabentry => 'clouds.pubinterface',
 	access_tabentry => 'clouds.name=attr:name',
     },
-    {   attr_name => 'mgtnet',
-	tabentry => 'clouds.mgtnet',
+    {   attr_name => 'mgtinterface',
+	tabentry => 'clouds.mgtinterface',
 	access_tabentry => 'clouds.name=attr:name',
     },
-    {   attr_name => 'vmnet',
-	tabentry => 'clouds.vmnet',
+    {   attr_name => 'datainterface',
+	tabentry => 'clouds.datainterface',
 	access_tabentry => 'clouds.name=attr:name',
     },
-    {   attr_name => 'adminpw',
-	tabentry => 'clouds.adminpw',
+    {   attr_name => 'template',
+	tabentry => 'clouds.template',
 	access_tabentry => 'clouds.name=attr:name',
     },
-    {   attr_name => 'dbpw',
-	tabentry => 'clouds.dbpw',
+    {   attr_name => 'repository',
+	tabentry => 'clouds.repository',
 	access_tabentry => 'clouds.name=attr:name',
     },
+    {   attr_name => 'virttype',
+	tabentry => 'clouds.virttype',
+	access_tabentry => 'clouds.name=attr:name',
+    }
 );
 
 #  node attributes for clouds