diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl index 5832657f0..2e73b1cbf 100644 --- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl +++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl @@ -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 # @@ -18,7 +18,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#" }, @@ -45,7 +45,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" @@ -97,7 +97,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"], @@ -125,7 +125,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", @@ -133,7 +133,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" => { @@ -142,10 +142,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", @@ -153,10 +153,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#" + } } } )