From f58051a6f23da080c1294346ad92f05583042a61 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 4 Jun 2015 10:39:53 +0000 Subject: WIP: tempest.conf add some neutron configuration Change-Id: I26a24c3cf28a675f2b5f64a692e3a4ddecc60e5a --- install-files/openstack/etc/tempest/tempest.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/install-files/openstack/etc/tempest/tempest.conf b/install-files/openstack/etc/tempest/tempest.conf index efd91827..0de60102 100644 --- a/install-files/openstack/etc/tempest/tempest.conf +++ b/install-files/openstack/etc/tempest/tempest.conf @@ -314,10 +314,10 @@ flavor_ref_alt = 2 #network_for_ssh = public # IP version used for SSH connections. (integer value) -#ip_version_for_ssh = 4 +ip_version_for_ssh = 4 # Does SSH use Floating IPs? (boolean value) -#use_floatingip_for_ssh = true +use_floatingip_for_ssh = true # Catalog type of the Compute service. (string value) catalog_type = compute @@ -325,7 +325,7 @@ catalog_type = compute # The compute region name to use. If empty, the value of # identity.region is used instead. If no such region is found in the # service catalog, the first found one is used. (string value) -region = oneRegion +region = regionOne # The endpoint type to use for the compute service. (string value) # Allowed values: public, admin, internal, publicURL, adminURL, internalURL @@ -724,22 +724,22 @@ test_generator = tempest.common.generator.negative_generator.NegativeTestGenerat # # Catalog type of the Neutron service. (string value) -#catalog_type = network +catalog_type = network # The network region name to use. If empty, the value of # identity.region is used instead. If no such region is found in the # service catalog, the first found one is used. (string value) -#region = +region = regionOne # The endpoint type to use for the network service. (string value) # Allowed values: public, admin, internal, publicURL, adminURL, internalURL -#endpoint_type = publicURL +endpoint_type = publicURL # The cidr block to allocate tenant ipv4 subnets from (string value) #tenant_network_cidr = 10.100.0.0/16 # The mask bits for tenant ipv4 subnets (integer value) -#tenant_network_mask_bits = 28 +tenant_network_mask_bits = 24 # The cidr block to allocate tenant ipv6 subnets from (string value) #tenant_network_v6_cidr = 2003::/48 @@ -925,7 +925,7 @@ test_generator = tempest.common.generator.negative_generator.NegativeTestGenerat # Enables or disables inter-process locks. (boolean value) # Deprecated group/name - [DEFAULT]/disable_process_locking -#disable_process_locking = false +disable_process_locking = false # Directory to use for lock files. For security, the specified # directory should only be writable by the user running the processes -- cgit v1.2.1