From c55a9e4fa4052adbe7e11f6cedc25213dfcb8ef5 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 16 Apr 2015 15:43:04 +0000 Subject: OpenStack: Configure Tempest at deployment time. This is being done using the 'template' option from the install-files extension. Signed-off-by: Zara Zaimeche Signed-off-by: Mike Smith Change-Id: Id3671d34692823e3f34f6565f40732b889cb8486 --- openstack/etc/tempest/tempest.conf | 108 +++++++++++++++++++------------------ openstack/manifest | 1 + 2 files changed, 56 insertions(+), 53 deletions(-) diff --git a/openstack/etc/tempest/tempest.conf b/openstack/etc/tempest/tempest.conf index 1cccaccc..05f0eca1 100644 --- a/openstack/etc/tempest/tempest.conf +++ b/openstack/etc/tempest/tempest.conf @@ -8,7 +8,7 @@ #disable_process_locking = false # Directory to use for lock files. (string value) -#lock_path = +lock_path = /run/lock # # From tempest.config @@ -58,7 +58,7 @@ # Use syslog for logging. Existing syslog format is DEPRECATED during # I, and will change in J to honor RFC5424. (boolean value) -#use_syslog = false +use_syslog = true # (Optional) Enables or disables syslog rfc5424 format for logging. If # enabled, prefixes the MSG part of the syslog message with APP-NAME @@ -121,7 +121,7 @@ # achieved configuring a list of test accounts (boolean value) # Deprecated group/name - [compute]/allow_tenant_isolation # Deprecated group/name - [orchestration]/allow_tenant_isolation -#allow_tenant_isolation = false +allow_tenant_isolation = true # If set to True it enables the Accounts provider, which locks # credentials to allow for parallel execution with pre-provisioned @@ -225,7 +225,7 @@ # # directory where python client binaries are located (string value) -#cli_dir = /usr/local/bin +cli_dir = /usr/bin # enable cli tests (boolean value) #enabled = true @@ -369,14 +369,14 @@ #domain_name = # API key to use when authenticating as admin. (string value) -#password = +password = {{ NOVA_SERVICE_PASSWORD }} # Administrative Tenant name to use for Nova API requests. (string # value) -#tenant_name = +tenant_name = service # Administrative Username to use for Nova API requests. (string value) -#username = +username = {{ NOVA_SERVICE_USER }} [compute-feature-enabled] @@ -392,7 +392,7 @@ #api_extensions = all # If false, skip all nova v3 tests. (boolean value) -#api_v3 = false +api_v3 = false # A list of enabled v3 extensions with a special entry all which # indicates every extension is enabled. Each extension should be @@ -451,18 +451,18 @@ # Does the test environment support creating snapshot images of # running instances? (boolean value) -#snapshot = true +snapshot = true # Enable Spice console. This configuration value should be same as # [nova.spice]->enabled in nova.conf (boolean value) -#spice_console = false +spice_console = false # Does the test environment support suspend/resume? (boolean value) #suspend = true # Enable VNC console. This configuration value should be same as # [nova.vnc]->vnc_enabled in nova.conf (boolean value) -#vnc_console = false +vnc_console = true # If false skip all v2 api tests with xml (boolean value) #xml_api_v2 = true @@ -475,10 +475,10 @@ # # Where the dashboard can be found (string value) -#dashboard_url = http://localhost/ +dashboard_url = http://{{ CONTROLLER_HOST_ADDRESS }}/horizon # Login page for the dashboard (string value) -#login_url = http://localhost/auth/login/ +login_url = http://{{ CONTROLLER_HOST_ADDRESS }}/horizon/auth/login/ [data_processing] @@ -546,18 +546,18 @@ #admin_domain_name = # API key to use when authenticating as admin. (string value) -#admin_password = +admin_password = {{ KEYSTONE_ADMIN_PASSWORD }} # Role required to administrate keystone. (string value) -#admin_role = admin +admin_role = admin # Administrative Tenant name to use for Keystone API requests. (string # value) -#admin_tenant_name = +admin_tenant_name = admin # Administrative Username to use for Keystone API requests. (string # value) -#admin_username = +admin_username = admin # Alternate domain name for authentication (Keystone V3).The same # domain applies to user and project (string value) @@ -576,10 +576,10 @@ # Identity API version to be used for authentication for API tests. # (string value) -#auth_version = v2 +auth_version = v2 # Catalog type of the Identity service. (string value) -#catalog_type = identity +catalog_type = identity # Set to True if using self-signed SSL certificates. (boolean value) #disable_ssl_certificate_validation = false @@ -592,7 +592,7 @@ #endpoint_type = publicURL # API key to use when authenticating. (string value) -#password = +password = {{ NOVA_SERVICE_PASSWORD }} # The identity region name to use. Also used as the other services' # region name unless they are set explicitly. If no such region is @@ -601,16 +601,18 @@ #region = RegionOne # Tenant name to use for Nova API requests. (string value) -#tenant_name = +tenant_name = service # Full URI of the OpenStack Identity API (Keystone), v2 (string value) -#uri = +uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0/ # Full URI of the OpenStack Identity API (Keystone), v3 (string value) -#uri_v3 = +# +# Tempest complains if we don't set any uri_v3, even if it's disabled. +uri_v3 = # Username to use for Nova API requests. (string value) -#username = +username = {{ NOVA_SERVICE_USER }} [identity-feature-enabled] @@ -620,10 +622,10 @@ # # Is the v2 identity API enabled (boolean value) -#api_v2 = true +api_v2 = true # Is the v3 identity API enabled (boolean value) -#api_v3 = true +api_v3 = false # Does the identity service have delegation and impersonation enabled # (boolean value) @@ -637,13 +639,13 @@ # # Catalog type of the Image service. (string value) -#catalog_type = image +catalog_type = image # The endpoint type to use for the image service. (string value) -#endpoint_type = publicURL +endpoint_type = publicURL # http accessible image (string value) -#http_image = http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz +http_image = http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz # The image region name to use. If empty, the value of identity.region # is used instead. If no such region is found in the service catalog, @@ -661,7 +663,7 @@ #api_v1 = true # Is the v2 image API enabled (boolean value) -#api_v2 = true +api_v2 = true [input-scenario] @@ -946,40 +948,40 @@ # Whether or not Ceilometer is expected to be available (boolean # value) -#ceilometer = true +ceilometer = false # Whether or not cinder is expected to be available (boolean value) -#cinder = true +cinder = true # Whether or not glance is expected to be available (boolean value) -#glance = true +glance = true # Whether or not Heat is expected to be available (boolean value) -#heat = false +heat = false # Whether or not Horizon is expected to be available (boolean value) -#horizon = true +horizon = true # Whether or not Ironic is expected to be available (boolean value) -#ironic = false +ironic = false # Whether or not neutron is expected to be available (boolean value) -#neutron = false +neutron = true # Whether or not nova is expected to be available (boolean value) -#nova = true +nova = true # Whether or not Sahara is expected to be available (boolean value) -#sahara = false +sahara = false # Whether or not swift is expected to be available (boolean value) -#swift = true +swift = false # Whether or not Trove is expected to be available (boolean value) -#trove = false +trove = false # Whether or not Zaqar is expected to be available (boolean value) -#zaqar = false +zaqar = false [stress] @@ -1049,7 +1051,7 @@ # Name of the backend1 (must be declared in cinder.conf) (string # value) -#backend1_name = BACKEND_1 +backend1_name = LVM_iSCSI # Name of the backend2 (must be declared in cinder.conf) (string # value) @@ -1063,13 +1065,13 @@ #build_timeout = 300 # Catalog type of the Volume Service (string value) -#catalog_type = volume +catalog_type = volume # Disk format to use when copying a volume to image (string value) -#disk_format = raw +disk_format = raw # The endpoint type to use for the volume service. (string value) -#endpoint_type = publicURL +endpoint_type = publicURL # The volume region name to use. If empty, the value of # identity.region is used instead. If no such region is found in the @@ -1077,14 +1079,14 @@ #region = # Backend protocol to target when creating volume types (string value) -#storage_protocol = iSCSI +storage_protocol = iSCSI # Backend vendor to target when creating volume types (string value) #vendor_name = Open Source # Default size in GB for volumes created by volumes tests (integer # value) -#volume_size = 1 +volume_size = 1 [volume-feature-enabled] @@ -1099,16 +1101,16 @@ #api_extensions = all # Is the v1 volume API enabled (boolean value) -#api_v1 = true +api_v1 = true # Is the v2 volume API enabled (boolean value) -#api_v2 = true +api_v2 = true # Runs Cinder volumes backup test (boolean value) -#backup = true +backup = true # Runs Cinder multi-backend test (requires 2 backends) (boolean value) -#multi_backend = false +multi_backend = false # Runs Cinder volume snapshot test (boolean value) -#snapshot = true +snapshot = true diff --git a/openstack/manifest b/openstack/manifest index ad2841d8..f3cc0f2d 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -2,6 +2,7 @@ 0100644 0 0 /etc/horizon/apache-horizon.conf 0040755 0 0 /etc/horizon/openstack_dashboard 0100644 0 0 /etc/horizon/openstack_dashboard/local_settings.py +template 0100644 0 0 /etc/tempest/tempest.conf 0040755 0 0 /usr/share/openstack 0100644 0 0 /usr/share/openstack/hosts 0040755 0 0 /usr/share/openstack/cinder -- cgit v1.2.1