Merge "Create entries for overcloud VIPs in /etc/hosts"

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

diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml
index 5a0ad23..36b609f 100644 (file)
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/puppet/services/neutron-ovs-agent.yaml
@@ -53,6 +53,9 @@ parameters:
     description: |
       Enable ARP responder feature in the OVS Agent.
     type: boolean
+  MonitoringSubscriptionNeutronOvs:
+    default: 'overcloud-neutron-ovs-agent'
+    type: string
 
 resources:
 
@@ -68,6 +71,7 @@ outputs:
     description: Role data for the Neutron OVS agent service.
     value:
       service_name: neutron_ovs_agent
+      monitoring_subscription: {get_param: MonitoringSubscriptionNeutronOvs}
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
@@ -89,5 +93,12 @@ outputs:
                 template: AGENT_EXTENSIONS
                 params:
                   AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions}
+            # NOTE: bind IP is found in Heat replacing the network name with the
+            # local node IP for the given network; replacement examples
+            # (eg. for internal_api):
+            # internal_api -> IP
+            # internal_api_uri -> [IP]
+            # internal_api_subnet - > IP/CIDR
+            neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
       step_config: |
         include ::tripleo::profile::base::neutron::ovs