xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

Remove trailing spaces in file xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl

Browse Source
This commit is contained in:
GONG Jie
2017-12-31 23:59:59 +00:00
parent a0ace194c9
commit 932f61870e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl
View File

@@ -1,4 +1,4 @@
#
#
# IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
# http://docs.openstack.org/grizzly/openstack-network/admin/content/app_demo_routers_with_private_networks.html
#
@@ -21,7 +21,7 @@ override_attributes(
"key_path"=>"/etc/chef/encrypted_data_bag_secret"
},
"db"=>{
"bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
"bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
"compute"=>{
"host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
},
@@ -48,7 +48,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"
@@ -100,7 +100,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"],
@@ -127,7 +127,7 @@ override_attributes(
"bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
},
"l3"=>{
"external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
"external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
},
"allow_overlapping_ips" => "True",
"use_namespaces" => "True",
@@ -135,7 +135,7 @@ override_attributes(
"tenant_network_type"=>"gre",
"tunnel_id_ranges"=>"1:1000",
"enable_tunneling"=>"True",
"local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#"
"local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#"
}
},
"compute" => {
@@ -144,10 +144,10 @@ override_attributes(
"host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
},
"xvpvnc_proxy"=>{
"bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
"bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
},
"novnc_proxy"=>{
"bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
"bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
},
"network" => {
"service_type" => "quantum",
@@ -155,10 +155,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#"
}
}
}
)