Merge "Rename network to 'public'"

This commit is contained in:
Jenkins 2015-12-15 02:27:40 +00:00 committed by Gerrit Code Review
commit 061d3f6b51

View File

@ -247,7 +247,7 @@ class infracloud::controller(
} }
# Provider network # Provider network
neutron_network { 'provider-net': neutron_network { 'public':
shared => true, shared => true,
provider_network_type => 'flat', provider_network_type => 'flat',
provider_physical_network => 'provider', provider_physical_network => 'provider',
@ -257,7 +257,7 @@ class infracloud::controller(
neutron_subnet { 'provider-subnet-53-54-55': neutron_subnet { 'provider-subnet-53-54-55':
cidr => '15.184.52.0/22', cidr => '15.184.52.0/22',
gateway_ip => '15.184.52.1', gateway_ip => '15.184.52.1',
network_name => 'provider-net', network_name => 'public',
allocation_pools => [ allocation_pools => [
'start=15.184.53.2,end=15.184.53.254', 'start=15.184.53.2,end=15.184.53.254',
'start=15.184.54.2,end=15.184.54.254', 'start=15.184.54.2,end=15.184.54.254',