aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Goncalves <carlos.goncalves@neclab.eu>2017-08-10 15:44:31 +0200
committerCarlos Goncalves <carlos.goncalves@neclab.eu>2017-08-11 00:30:27 +0200
commitf9fad060e9284d64511c2707eb58a6a87dfafa5c (patch)
tree700045a38e2ccd32fad763837aac7651efb8180a
parentd26ec42567672048ec3197119fed24fd80c15c3b (diff)
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 <carlos.goncalves@neclab.eu>
-rw-r--r--environments/enable_congress.yaml9
-rw-r--r--puppet/services/congress.yaml10
2 files changed, 19 insertions, 0 deletions
diff --git a/environments/enable_congress.yaml b/environments/enable_congress.yaml
index 1eea7f5..8158ada 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 dc786b6..19ed086 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'