Merge "Add trunking plugin to list of default ML2 service plugins"

[apex-tripleo-heat-templates.git] / puppet / services / neutron-l3.yaml

diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml
index f71bb77..de62a50 100644 (file)
--- a/puppet/services/neutron-l3.yaml
+++ b/puppet/services/neutron-l3.yaml
@@ -10,6 +10,9 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -31,6 +34,9 @@ parameters:
       - allowed_values:
         - legacy
         - dvr_snat
+  MonitoringSubscriptionNeutronL3:
+    default: 'overcloud-neutron-l3-agent'
+    type: string
 
 resources:
 
@@ -38,6 +44,7 @@ resources:
     type: ./neutron-base.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -45,6 +52,7 @@ outputs:
     description: Role data for the Neutron L3 agent service.
     value:
       service_name: neutron_l3
+      monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3}
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]