Merge "Added t-h-t for tempest container"

This commit is contained in:
Zuul 2018-03-13 12:43:51 +00:00 committed by Gerrit Code Review
commit 4c58be93a7
7 changed files with 65 additions and 0 deletions

View File

@ -0,0 +1,55 @@
heat_template_version: queens
description: >
OpenStack containerized Tempest
parameters:
DockerTempestImage:
description: image
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
ServiceData:
default: {}
description: Dictionary packing service data
type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
UpgradeRemoveUnusedPackages:
default: false
description: Remove package if the service is being disabled during upgrade
type: boolean
outputs:
role_data:
description: Role data for the tempest service
value:
# It just adds a fake tempest service so that it will be
# available on undercloud.
service_name: tempest
docker_config:
volumes: ''
host_prep_tasks: {}
puppet_config:
config_volume: ''
step_config: ''
config_image: {get_param: DockerTempestImage}
config_settings: {}

View File

@ -0,0 +1,2 @@
resource_registry:
OS::TripleO::Services::Tempest: ../puppet/services/tempest.yaml

View File

@ -0,0 +1,2 @@
resource_registry:
OS::TripleO::Services::Tempest: ../../docker/services/tempest.yaml

View File

@ -351,6 +351,9 @@ resource_registry:
OS::TripleO::Services::Logging::NovaPlacement: docker/services/logging/files/nova-placement.yaml
OS::TripleO::Services::Logging::PankoApi: docker/services/logging/files/panko-api.yaml
# Tempest
OS::TripleO::Services::Tempest: OS::Heat::None
parameter_defaults:
EnablePackageInstall: false
SoftwareConfigTransport: POLL_TEMP_URL

View File

@ -72,3 +72,4 @@
- OS::TripleO::Services::UndercloudHAProxy
- OS::TripleO::Services::UndercloudKeepalived
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::Tempest

View File

@ -35,3 +35,4 @@
- OS::TripleO::Services::SwiftRingBuilder
- OS::TripleO::Services::SwiftStorage
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::Tempest

View File

@ -75,4 +75,5 @@
- OS::TripleO::Services::UndercloudHAProxy
- OS::TripleO::Services::UndercloudKeepalived
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::Tempest