summaryrefslogtreecommitdiffstats
path: root/ci/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-01 15:59:40 +0000
committerGerrit Code Review <review@openstack.org>2016-12-01 15:59:40 +0000
commite85422bd849613f20bffefd59ebb3dc29407382b (patch)
treec73725480d2ff060caec82f32dd869b163effd3b /ci/environments
parent370d392dc58a124ffe09800476d1099bf6268cb3 (diff)
parent5d185207be602a20b1ded1f4eec616351e037db8 (diff)
Merge "Make scenario template paths relative"
Diffstat (limited to 'ci/environments')
-rw-r--r--ci/environments/scenario003-multinode.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/environments/scenario003-multinode.yaml b/ci/environments/scenario003-multinode.yaml
index e540bc55..25fe1697 100644
--- a/ci/environments/scenario003-multinode.yaml
+++ b/ci/environments/scenario003-multinode.yaml
@@ -1,11 +1,11 @@
resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
- OS::TripleO::Services::SaharaApi: /usr/share/openstack-tripleo-heat-templates/puppet/services/sahara-api.yaml
- OS::TripleO::Services::SaharaEngine: /usr/share/openstack-tripleo-heat-templates/puppet/services/sahara-engine.yaml
- OS::TripleO::Services::MistralApi: /usr/share/openstack-tripleo-heat-templates/puppet/services/mistral-api.yaml
- OS::TripleO::Services::MistralEngine: /usr/share/openstack-tripleo-heat-templates/puppet/services/mistral-engine.yaml
- OS::TripleO::Services::MistralExecutor: /usr/share/openstack-tripleo-heat-templates/puppet/services/mistral-executor.yaml
+ OS::TripleO::Services::SaharaApi: ../../puppet/services/sahara-api.yaml
+ OS::TripleO::Services::SaharaEngine: ../../puppet/services/sahara-engine.yaml
+ OS::TripleO::Services::MistralApi: ../../puppet/services/mistral-api.yaml
+ OS::TripleO::Services::MistralEngine: ../../puppet/services/mistral-engine.yaml
+ OS::TripleO::Services::MistralExecutor: ../../puppet/services/mistral-executor.yaml
parameter_defaults:
ControllerServices: