aboutsummaryrefslogtreecommitdiffstats
path: root/ci/environments
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-05-15 10:29:39 -0400
committerSteven Hardy <shardy@redhat.com>2017-05-15 10:29:39 -0400
commit22433c54af1bac63c256971da43a2070d0608900 (patch)
tree04c15698989201ec542a21b79e79e7a4318820ca /ci/environments
parente8dc8c6faeabfbe0fc82dd554c9f184e6a087ae4 (diff)
Fix absolute paths in scenario001-multinode.yaml
All paths should be relative as we should not rely on the package location - this can easily be overridden via --templates, and this is exactly what we do for the upgrades job, where this will break because we'll include the wrong (newer) version of these services when deploying the older pre-upgrade overcloud. Change-Id: Id8aea09305c0857253c44477945e34377cca64ca
Diffstat (limited to 'ci/environments')
-rw-r--r--ci/environments/scenario001-multinode.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml
index a5c85aa..437d7c3 100644
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@@ -19,8 +19,8 @@ resource_registry:
OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
- OS::TripleO::Services::FluentdClient: /usr/share/openstack-tripleo-heat-templates/puppet/services/logging/fluentd-client.yaml
- OS::TripleO::Services::SensuClient: /usr/share/openstack-tripleo-heat-templates/puppet/services/monitoring/sensu-client.yaml
+ OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml
+ OS::TripleO::Services::SensuClient: ../../puppet/services/monitoring/sensu-client.yaml
parameter_defaults:
ControllerServices: