diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-05-28 09:54:26 +0000 |
---|---|---|
committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-06-11 17:04:29 +0000 |
commit | e10ad8da85f1dc117d8df7a4c088b98d6335806d (patch) | |
tree | 3cbedf1d6f451bb975a77cf112cf3406615c6188 /install-files/openstack/etc | |
parent | bfe523b5328d9fdccefb29b685d396e3de7427e2 (diff) | |
download | definitions-e10ad8da85f1dc117d8df7a4c088b98d6335806d.tar.gz |
OpenStack: Add custom configuration for the components
Add custom configuration for Keystone, Nova, Neutron, Cinder,
Glance, Ironic, Swift, Ceilometer, Horizon and Tempest for Openstack
Kilo release.
Notes:
- Horizon configuration has change in order to be less error prone
and to be close to the default configuration, the following changes
has been made to achive this purpose:
- Install the openstack_dashboard django project in /var/lib/horizon
avoiding:
- to write in /usr/lib/python2.7/site-packages/static
- to maintain a copy of local_settings.py
- to create a symlink as workaround to make django.wsgi to work
with the previous configuration.
- Change the path of django.wsgi file
- Remove the 'horizon/' suffix to access Horizon via URL.
- Grant permissions to access to /var/lib/horizon/static
Signed-off-by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Signed-off-by: Patrick Darley <patrick.darley@codethink.co.uk>
Signed-off-by: Tiago Gomes <tiago.gomes@codethink.co.uk>
Change-Id: I1fda4f85eb334b1b5bfec54dfcd9780a6112ea3b
Diffstat (limited to 'install-files/openstack/etc')
-rw-r--r-- | install-files/openstack/etc/horizon/apache-horizon.conf | 10 | ||||
-rw-r--r-- | install-files/openstack/etc/tempest/tempest.conf | 228 |
2 files changed, 120 insertions, 118 deletions
diff --git a/install-files/openstack/etc/horizon/apache-horizon.conf b/install-files/openstack/etc/horizon/apache-horizon.conf index ea88897a..ab3cf0c7 100644 --- a/install-files/openstack/etc/horizon/apache-horizon.conf +++ b/install-files/openstack/etc/horizon/apache-horizon.conf @@ -1,16 +1,18 @@ <VirtualHost *:80> - WSGIScriptAlias /horizon /var/lib/horizon/openstack_dashboard/django.wsgi + WSGIScriptAlias / /var/lib/horizon/openstack_dashboard/wsgi/django.wsgi WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 home=/var/lib/horizon display-name=horizon WSGIApplicationGroup %{GLOBAL} - RedirectMatch ^/$ /horizon/ - SetEnv APACHE_RUN_USER apache SetEnv APACHE_RUN_GROUP apache WSGIProcessGroup horizon DocumentRoot /var/lib/horizon/.blackhole - Alias /static /var/lib/horizon/openstack_dashboard/static + Alias /static /var/lib/horizon/static + + <Directory /var/lib/horizon/static> + Require all granted + </Directory> <Directory /var/lib/horizon/openstack_dashboard > Options Indexes FollowSymLinks MultiViews diff --git a/install-files/openstack/etc/tempest/tempest.conf b/install-files/openstack/etc/tempest/tempest.conf index fcc8db9e..ad3d7fb2 100644 --- a/install-files/openstack/etc/tempest/tempest.conf +++ b/install-files/openstack/etc/tempest/tempest.conf @@ -41,7 +41,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 @@ -107,7 +107,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 = true +allow_tenant_isolation = true # Roles to assign to all users created by tempest (list value) #tempest_roles = @@ -208,15 +208,15 @@ # # enable cli tests (boolean value) -#enabled = true +enabled = true # directory where python client binaries are located (string value) -#cli_dir = /usr/local/bin +cli_dir = /usr/bin # Whether the tempest run location has access to the *-manage # commands. In a pure blackbox environment it will not. (boolean # value) -#has_manage = true +has_manage = true # Number of seconds to wait on a CLI timeout (integer value) #timeout = 15 @@ -238,10 +238,10 @@ #image_ref_alt = <None> # Valid primary flavor to use in tests. (string value) -#flavor_ref = 1 +flavor_ref = 1 # Valid secondary flavor to be used in tests. (string value) -#flavor_ref_alt = 2 +flavor_ref_alt = 2 # User name used to authenticate to an instance. (string value) #image_ssh_user = root @@ -254,12 +254,12 @@ #image_alt_ssh_user = root # Time in seconds between build status checks. (integer value) -#build_interval = 1 +build_interval = 1 # Timeout in seconds to wait for an instance to build. Other services # that do not define build_timeout will inherit this value. (integer # value) -#build_timeout = 300 +build_timeout = 300 # Should the tests ssh to instances? (boolean value) #run_ssh = false @@ -269,12 +269,12 @@ # servers with a ssh keypair. Configured: use the configured user and # password. Adminpass: use the injected adminPass. Disabled: avoid # using ssh when it is an option. (string value) -#ssh_auth_method = keypair +ssh_auth_method = adminpass # How to connect to the instance? fixed: using the first ip belongs # the fixed network floating: creating and using a floating ip. # (string value) -#ssh_connect_method = floating +ssh_connect_method = floating # User name used to authenticate to an instance. (string value) #ssh_user = root @@ -314,26 +314,26 @@ #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 # Catalog type of the Compute service. (string value) -#catalog_type = compute +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 = +region = regionOne # The endpoint type to use for the compute service. (string value) # Allowed values: public, admin, internal, publicURL, adminURL, internalURL -#endpoint_type = publicURL +endpoint_type = publicURL # Expected device name when a volume is attached to an instance # (string value) -#volume_device_name = vdb +volume_device_name = vdb # Time in seconds before a shelved instance is eligible for removing # from a host. -1 never offload, 0 offload when shelved. This time @@ -354,7 +354,7 @@ # # If false, skip disk config tests (boolean value) -#disk_config = true +disk_config = true # A list of enabled compute extensions with a special entry all which # indicates every extension is enabled. Each extension should be @@ -364,28 +364,28 @@ # Does the test environment support changing the admin password? # (boolean value) -#change_password = false +change_password = false # Does the test environment support obtaining instance serial console # output? (boolean value) -#console_output = true +console_output = true # Does the test environment support resizing? (boolean value) -#resize = false +resize = false # Does the test environment support pausing? (boolean value) -#pause = true +pause = true # Does the test environment support shelving/unshelving? (boolean # value) -#shelve = true +shelve = true # Does the test environment support suspend/resume? (boolean value) -#suspend = true +suspend = true # Does the test environment support live migration available? (boolean # value) -#live_migration = true +live_migration = false # Does the test environment use block devices for live migration # (boolean value) @@ -394,43 +394,43 @@ # Does the test environment block migration support cinder iSCSI # volumes. Note, libvirt doesn't support this, see # https://bugs.launchpad.net/nova/+bug/1398999 (boolean value) -#block_migrate_cinder_iscsi = false +block_migrate_cinder_iscsi = false # 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 # Enable Spice console. This configuration value should be same as # [nova.spice]->enabled in nova.conf (boolean value) -#spice_console = false +spice_console = false # Enable RDP console. This configuration value should be same as # [nova.rdp]->enabled in nova.conf (boolean value) -#rdp_console = false +rdp_console = false # Does the test environment support instance rescue mode? (boolean # value) -#rescue = true +rescue = true # Enables returning of the instance password by the relevant server # API calls such as create, rebuild or rescue. (boolean value) -#enable_instance_password = true +enable_instance_password = true # Does the test environment support dynamic network interface # attachment? (boolean value) -#interface_attach = true +interface_attach = true # Does the test environment support creating snapshot images of # running instances? (boolean value) -#snapshot = true +snapshot = true # Does the test environment have the ec2 api running? (boolean value) -#ec2_api = true +ec2_api = false # Does Nova preserve preexisting ports from Neutron when deleting an # instance? This should be set to True if testing Kilo+ Nova. (boolean # value) -#preserve_ports = false +preserve_ports = true [dashboard] @@ -440,10 +440,10 @@ # # Where the dashboard can be found (string value) -#dashboard_url = http://localhost/ +dashboard_url = http://{{ CONTROLLER_HOST_ADDRESS }} # Login page for the dashboard (string value) -#login_url = http://localhost/auth/login/ +login_url = http://{{ CONTROLLER_HOST_ADDRESS }}/auth/login/ [data_processing] @@ -515,7 +515,7 @@ # # 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 @@ -525,36 +525,36 @@ #ca_certificates_file = <None> # Full URI of the OpenStack Identity API (Keystone), v2 (string value) -#uri = <None> +uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0/ # Full URI of the OpenStack Identity API (Keystone), v3 (string value) #uri_v3 = <None> # Identity API version to be used for authentication for API tests. # (string value) -#auth_version = v2 +auth_version = v2 # The identity region name to use. Also used as the other services' # region name unless they are set explicitly. If no such region is # found in the service catalog, the first found one is used. (string # value) -#region = RegionOne +region = RegionOne # The endpoint type to use for the identity service. (string value) # Allowed values: public, admin, internal, publicURL, adminURL, internalURL -#endpoint_type = publicURL +endpoint_type = publicURL # Username to use for Nova API requests. (string value) -#username = <None> +username = {{ NOVA_SERVICE_USER }} # Tenant name to use for Nova API requests. (string value) -#tenant_name = <None> +tenant_name = service # Role required to administrate keystone. (string value) -#admin_role = admin +admin_role = admin # API key to use when authenticating. (string value) -#password = <None> +password = {{ NOVA_SERVICE_PASSWORD }} # Domain name for authentication (Keystone V3).The same domain applies # to user and project (string value) @@ -577,14 +577,14 @@ # Administrative Username to use for Keystone API requests. (string # value) -#admin_username = <None> +admin_username = admin # Administrative Tenant name to use for Keystone API requests. (string # value) -#admin_tenant_name = <None> +admin_tenant_name = admin # API key to use when authenticating as admin. (string value) -#admin_password = <None> +admin_password = {{ KEYSTONE_ADMIN_PASSWORD }} # Admin domain name for authentication (Keystone V3).The same domain # applies to user and project (string value) @@ -599,13 +599,13 @@ # Does the identity service have delegation and impersonation enabled # (boolean value) -#trust = true +trust = false # 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 [image] @@ -615,27 +615,27 @@ # # Catalog type of the Image service. (string value) -#catalog_type = image +catalog_type = image # 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, # the first found one is used. (string value) -#region = +region = regionOne # The endpoint type to use for the image service. (string value) # Allowed values: public, admin, internal, publicURL, adminURL, internalURL -#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 # Timeout in seconds to wait for an image to become available. # (integer value) -#build_timeout = 300 +build_timeout = 300 # Time in seconds between image operation status checks. (integer # value) -#build_interval = 1 +build_interval = 1 [image-feature-enabled] @@ -645,7 +645,7 @@ # # Is the v2 image API enabled (boolean value) -#api_v2 = true +api_v2 = true # Is the v1 image API enabled (boolean value) #api_v1 = true @@ -658,10 +658,10 @@ # # Matching images become parameters for scenario tests (string value) -#image_regex = ^cirros-0.3.1-x86_64-uec$ +image_regex = ^cirros-0.3.1-x86_64-uec$ # Matching flavors become parameters for scenario tests (string value) -#flavor_regex = ^m1.nano$ +flavor_regex = ^m1.nano$ # SSH verification in tests is skippedfor matching images (string # value) @@ -678,33 +678,33 @@ # # Catalog type of the Messaging service. (string value) -#catalog_type = messaging +catalog_type = messaging # The maximum number of queue records per page when listing queues # (integer value) -#max_queues_per_page = 20 +max_queues_per_page = 20 # The maximum metadata size for a queue (integer value) -#max_queue_metadata = 65536 +max_queue_metadata = 65536 # The maximum number of queue message per page when listing (or) # posting messages (integer value) -#max_messages_per_page = 20 +max_messages_per_page = 20 # The maximum size of a message body (integer value) -#max_message_size = 262144 +max_message_size = 262144 # The maximum number of messages per claim (integer value) -#max_messages_per_claim = 20 +max_messages_per_claim = 20 # The maximum ttl for a message (integer value) -#max_message_ttl = 1209600 +max_message_ttl = 1209600 # The maximum ttl for a claim (integer value) -#max_claim_ttl = 43200 +max_claim_ttl = 43200 # The maximum grace period for a claim (integer value) -#max_claim_grace = 43200 +max_claim_grace = 43200 [negative] @@ -714,7 +714,7 @@ # # Test generator class for all negative tests (string value) -#test_generator = tempest.common.generator.negative_generator.NegativeTestGenerator +test_generator = tempest.common.generator.negative_generator.NegativeTestGenerator [network] @@ -724,22 +724,22 @@ # # 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 +tenant_network_cidr = 192.168.1.0/24 # The mask bits for tenant ipv4 subnets (integer value) -#tenant_network_mask_bits = 28 +tenant_network_mask_bits = 28 # The cidr block to allocate tenant ipv6 subnets from (string value) #tenant_network_v6_cidr = 2003::/48 @@ -768,11 +768,11 @@ # Timeout in seconds to wait for network operation to complete. # (integer value) -#build_timeout = 300 +build_timeout = 300 # Time in seconds between network operation status checks. (integer # value) -#build_interval = 1 +build_interval = 1 # List of dns servers which should be used for subnet creation (list # value) @@ -791,7 +791,7 @@ # # Allow the execution of IPv6 tests (boolean value) -#ipv6 = true +ipv6 = false # A list of enabled network extensions with a special entry all which # indicates every extension is enabled. Empty list indicates all @@ -925,14 +925,14 @@ # 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 # that need locking. Defaults to environment variable OSLO_LOCK_PATH. # If external locks are used, a lock path must be set. (string value) # Deprecated group/name - [DEFAULT]/lock_path -#lock_path = <None> +lock_path = /run/lock [scenario] @@ -984,41 +984,41 @@ # # Whether or not cinder is expected to be available (boolean value) -#cinder = true +cinder = true # Whether or not neutron is expected to be available (boolean value) -#neutron = false +neutron = true # Whether or not glance is expected to be available (boolean value) -#glance = true +glance = true # Whether or not swift is expected to be available (boolean value) -#swift = true +swift = false # Whether or not nova is expected to be available (boolean value) -#nova = true +nova = true # Whether or not Heat is expected to be available (boolean value) -#heat = false +heat = false # Whether or not Ceilometer is expected to be available (boolean # value) -#ceilometer = true +ceilometer = true # Whether or not Horizon is expected to be available (boolean value) -#horizon = true +horizon = true # Whether or not Sahara is expected to be available (boolean value) -#sahara = false +sahara = false # Whether or not Ironic is expected to be available (boolean value) -#ironic = false +ironic = 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] @@ -1070,15 +1070,15 @@ # # Catalog type of the Telemetry service. (string value) -#catalog_type = metering +catalog_type = metering # The endpoint type to use for the telemetry service. (string value) # Allowed values: public, admin, internal, publicURL, adminURL, internalURL -#endpoint_type = publicURL +endpoint_type = publicURL # This variable is used as flag to enable notification tests (boolean # value) -#too_slow_to_test = true +too_slow_to_test = true [validation] @@ -1091,26 +1091,26 @@ # belonging to the fixed network -floating: creates and uses a # floating IP (string value) # Allowed values: fixed, floating -#connect_method = floating +connect_method = floating # Default authentication method to the instance. Only ssh via keypair # is supported for now. Additional methods will be handled in a # separate spec. (string value) # Allowed values: keypair -#auth_method = keypair +auth_method = keypair # Default IP version for ssh connections. (integer value) -#ip_version_for_ssh = 4 +ip_version_for_ssh = 4 # Timeout in seconds to wait for ping to succeed. (integer value) -#ping_timeout = 120 +ping_timeout = 120 # Timeout in seconds to wait for the TCP connection to be successful. # (integer value) -#connect_timeout = 60 +connect_timeout = 60 # Timeout in seconds to wait for the ssh banner. (integer value) -#ssh_timeout = 300 +ssh_timeout = 300 [volume] @@ -1127,37 +1127,37 @@ #build_timeout = 300 # Catalog type of the Volume Service (string value) -#catalog_type = volume +catalog_type = volume # The volume 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 volume service. (string value) # Allowed values: public, admin, internal, publicURL, adminURL, internalURL -#endpoint_type = publicURL +endpoint_type = publicURL # 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) #backend2_name = BACKEND_2 # 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 # Disk format to use when copying a volume to image (string value) -#disk_format = raw +disk_format = raw # Default size in GB for volumes created by volumes tests (integer # value) -#volume_size = 1 +volume_size = 1 [volume-feature-enabled] @@ -1167,22 +1167,22 @@ # # Runs Cinder multi-backend test (requires 2 backends) (boolean value) -#multi_backend = false +multi_backend = false # Runs Cinder volumes backup test (boolean value) -#backup = true +backup = false # Runs Cinder volume snapshot test (boolean value) -#snapshot = true +snapshot = true # A list of enabled volume extensions with a special entry all which # indicates every extension is enabled. Empty list indicates all # extensions are disabled (list value) -#api_extensions = all +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 |