openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Configure amphora for upload and run tempest" into stable/stein

This commit is contained in:
Zuul 2019-11-02 02:57:08 +00:00 committed by Gerrit Code Review
parent 61c40a7800 4a8a8ec1dd
commit 7df05d2fbb
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/scenario010-multinode-containers.yaml
View File

@ -79,6 +79,7 @@ parameter_defaults:
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu
octavia::controller::connection_retry_interval: 10
Debug: true
LocalCephAnsibleFetchDirectoryBackup: /var/lib/ceph_ansible_fetch
CephAnsibleDisksConfig:
@ -114,6 +115,7 @@ parameter_defaults:
GnocchiRbdPoolName: metrics
SwiftCeilometerPipelineEnabled: false
NeutronEnableForceMetadata: true
OctaviaAmphoraImageFilename: /home/zuul/amphora.qcow2
OctaviaManageNovaFlavor: true
# For now, we hardcode it but soon it'll be generated in tripleo-common
OctaviaCaKeyPassphrase: 'upstreamci'

6
ci/environments/scenario010-standalone.yaml
View File

@ -31,7 +31,13 @@ resource_registry:
OS::TripleO::Services::Horizon: OS::Heat::None
parameter_defaults:
StandaloneExtraConfig:
octavia::controller::connection_retry_interval: 10
OctaviaAmphoraSshKeyFile: /home/zuul/.ssh/id_rsa.pub
OctaviaAmphoraImageFilename: /home/zuul/amphora.qcow2
OctaviaCaKeyPassphrase: 'upstreamci'
OctaviaManageNovaFlavor: true
OctaviaGenerateCerts: true
NodeDataLookup:
AB4114B1-9C9D-409A-BEFB-D88C151BF2C3: {"foo": "bar"}
8CF1A7EA-7B4B-4433-AC83-17675514B1B8: {"foo2": "bar2"}