Merge "Remove tacker from containers scenario001"

This commit is contained in:
Jenkins 2017-09-04 09:01:08 +00:00 committed by Gerrit Code Review
commit 7ce3543365

View File

@ -12,7 +12,6 @@ resource_registry:
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml
OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml
OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
# TODO fluentd is being containerized: https://review.openstack.org/#/c/467072/ # TODO fluentd is being containerized: https://review.openstack.org/#/c/467072/
OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml
@ -87,7 +86,6 @@ parameter_defaults:
- OS::TripleO::Services::CinderScheduler - OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume - OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Collectd - OS::TripleO::Services::Collectd
- OS::TripleO::Services::Tacker
- OS::TripleO::Services::Congress - OS::TripleO::Services::Congress
- OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoFirewall