From c13aa6c8a154a30a2a0e1b957fb40ed754efe85d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH] Remove trailing spaces in file xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl --- .../grizzly_keystone_swift_allinone.rb.tmpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl index cf41f73af..38c83865a 100644 --- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl +++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl @@ -2,7 +2,7 @@ # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html # # -# When using this template, you should change the proxy-cidr and object-cidr +# When using this template, you should change the proxy-cidr and object-cidr # according to your actual network environment!!!!!!!! # @@ -33,7 +33,7 @@ override_attributes( "openstack" => { "developer_mode" => true, "db"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "compute"=>{ "host"=>"#TABLE:clouds:name=$CLOUD:hostip#" }, @@ -61,7 +61,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "identity"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "db"=>{ "username"=>"keystone", "password"=> "keystone" @@ -112,7 +112,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "registry"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "image_upload" => false, "upload_images" => ["cirros"], @@ -169,10 +169,10 @@ override_attributes( "config" => { "ram_allocation_ratio" => 5.0 }, - "libvirt" => { - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", - "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" - } + "libvirt" => { + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" + } } } )