From 3c7870afbc726e494b2b0f5ffbfcc4d7ad570c3d Mon Sep 17 00:00:00 2001 From: linggao Date: Sat, 5 Apr 2014 04:42:28 -0400 Subject: [PATCH] removed the dependency on openrc file, fixed defect 4040 and 4041 --- xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm b/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm index 8a576001b..1496f5b56 100644 --- a/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm +++ b/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm @@ -276,7 +276,7 @@ sub opsaddbmnode { } $cmd_tmp .= " $host $cpu $memory $disk $mac"; - my $cmd = qq~source \~/openrc;$cmd_tmp~; + my $cmd = qq~$cmd_tmp~; if ($verbose) { my $rsp; push @{$rsp->{data}}, "The command to run on $host:"; @@ -422,7 +422,7 @@ sub opsaddimage { } my $cmd_tmp = "glance image-create --name $new_name --public --disk-format qcow2 --container-format bare --property xcat_image_name=\'$image\' < /tmp/$image.qcow2"; - my $cmd = qq~touch /tmp/$image.qcow2;source \~/openrc;$cmd_tmp~; + my $cmd = qq~touch /tmp/$image.qcow2;$cmd_tmp~; if ($verbose) { my $rsp; push @{$rsp->{data}}, "The command to run on $controller:";