Add enable_tempest option

This patch adds an option to disable the installation of Tempest
packages in each undercloud. Users may or may not want
to run Tempest from their undercloud... not installing it
saves us network bandwidth and CI time upstream as well
(where we don't even have the extra time to execute Tempest
at this point currently anyway).

Change-Id: If18b3d333bdbdc20390cb8d952e8c6182218cc1d
This commit is contained in:
Dan Prince 2015-08-28 15:25:17 -04:00
parent 14e274fab9
commit bab777f2f6
5 changed files with 17 additions and 6 deletions

View File

@ -54,7 +54,7 @@ context = {
'UNDERCLOUD_TUSKAR_PASSWORD': os.environ.get('UNDERCLOUD_TUSKAR_PASSWORD', 'unset'),
'UNDERCLOUD_DEBUG': os.environ.get('UNDERCLOUD_DEBUG', 'true'),
'ENABLE_TUSKAR': os.environ.get('ENABLE_TUSKAR', 'true'),
'ENABLE_TEMPEST': os.environ.get('ENABLE_TEMPEST', 'true'),
'KEYSTONE_SIGNING_CERTIFICATE':
open(os.path.join(keystone_pki_dir, 'signing_cert.pem')).read(),
'KEYSTONE_SIGNING_KEY':

View File

@ -382,8 +382,10 @@ if str2bool(hiera('enable_tuskar', 'true')) {
}
}
# tempest
# TODO: when puppet-tempest supports install by package, do that instead
package{'openstack-tempest': }
# needed for /bin/subunit-2to1 (called by run_tempest.sh)
package{'subunit-filters': }
if str2bool(hiera('enable_tempest', 'true')) {
# tempest
# TODO: when puppet-tempest supports install by package, do that instead
package{'openstack-tempest': }
# needed for /bin/subunit-2to1 (called by run_tempest.sh)
package{'subunit-filters': }
}

View File

@ -214,3 +214,4 @@ swift::proxy::authtoken::admin_tenant_name: 'service'
# Options
enable_tuskar: {{ENABLE_TUSKAR}}
enable_tempest: {{ENABLE_TEMPEST}}

View File

@ -150,6 +150,10 @@ _opts = [
default=True,
help=('Whether to install Tuskar services in the Undercloud.')
),
cfg.BoolOpt('enable_tempest',
default=True,
help=('Whether to install Tempest in the Undercloud.')
),
]
# Passwords, tokens, hashes

View File

@ -62,6 +62,10 @@
# (boolean value)
#enable_tuskar = true
# Whether to install Tempest packages in the Undercloud.
# (boolean value)
#enable_tempest = true
[auth]
#