From f9fad060e9284d64511c2707eb58a6a87dfafa5c Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Thu, 10 Aug 2017 15:44:31 +0200 Subject: Adds Doctor DS driver to Congress Include the Doctor data source driver to the list of drivers to load. JIRA: APEX-498 Change-Id: I0749ed6e0d27bd4c9a5bb19657579d400501d09e Signed-off-by: Carlos Goncalves --- environments/enable_congress.yaml | 9 +++++++++ puppet/services/congress.yaml | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/environments/enable_congress.yaml b/environments/enable_congress.yaml index 1eea7f5e..8158ada1 100644 --- a/environments/enable_congress.yaml +++ b/environments/enable_congress.yaml @@ -1,2 +1,11 @@ resource_registry: OS::TripleO::Services::Congress: ../puppet/services/congress.yaml + +parameter_defaults: + CongressDrivers: ['congress.datasources.neutronv2_driver.NeutronV2Driver', + 'congress.datasources.glancev2_driver.GlanceV2Driver', + 'congress.datasources.nova_driver.NovaDriver', + 'congress.datasources.keystone_driver.KeystoneDriver', + 'congress.datasources.ceilometer_driver.CeilometerDriver', + 'congress.datasources.cinder_driver.CinderDriver', + 'congress.datasources.doctor_driver.DoctorDriver'] diff --git a/puppet/services/congress.yaml b/puppet/services/congress.yaml index dc786b6a..19ed086a 100644 --- a/puppet/services/congress.yaml +++ b/puppet/services/congress.yaml @@ -47,6 +47,15 @@ parameters: default: 5672 description: Set rabbit subscriber port, change this if using SSL type: number + CongressDrivers: + default: ['congress.datasources.neutronv2_driver.NeutronV2Driver', + 'congress.datasources.glancev2_driver.GlanceV2Driver', + 'congress.datasources.nova_driver.NovaDriver', + 'congress.datasources.keystone_driver.KeystoneDriver', + 'congress.datasources.ceilometer_driver.CeilometerDriver', + 'congress.datasources.cinder_driver.CinderDriver'] + description: Comma-separated list of data source drivers + type: comma_delimited_list outputs: role_data: @@ -72,6 +81,7 @@ outputs: congress::rabbit_use_ssl: {get_param: RabbitClientUseSSL} congress::rabbit_port: {get_param: RabbitClientPort} congress::server::bind_host: {get_param: [ServiceNetMap, CongressApiNetwork]} + congress::drivers: {get_param: CongressDrivers} congress::keystone::authtoken::password: {get_param: CongressPassword} congress::keystone::authtoken::project_name: 'service' -- cgit 1.2.3-korg