diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-25 20:49:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-25 20:49:56 +0000 |
| commit | 8ab1918f026aaa9d06dd4cadd1ad5e15f06b220f (patch) | |
| tree | 1850cf1666d63ba5c9fe855d332adb2412970d5e /ci | |
| parent | 74a97cb69a7822b620eb35527f5a1a48d94d7221 (diff) | |
| parent | e02c3c296219a774b5c8710a643144c903bbb0b4 (diff) | |
Merge "Add ec2-api service"
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/environments/scenario002-multinode.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml index 636b3a26..0dfa78d3 100644 --- a/ci/environments/scenario002-multinode.yaml +++ b/ci/environments/scenario002-multinode.yaml @@ -3,6 +3,7 @@ resource_registry: OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml + OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml parameter_defaults: ControllerServices: @@ -45,6 +46,7 @@ parameter_defaults: - OS::TripleO::Services::BarbicanApi - OS::TripleO::Services::MongoDb - OS::TripleO::Services::Zaqar + - OS::TripleO::Services::Ec2Api ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu |