From e13e473ddb3cc31618775de9f18582df4135392f Mon Sep 17 00:00:00 2001 From: Saravanan KR Date: Wed, 14 Feb 2018 11:26:32 +0530 Subject: [PATCH] Add role_specific tag to missing role-specific parameters A tag 'role_specific' should be added to the parameters of a service which are accepted as role-specific. Adding the tag for some of the missing parameters. Closes-Bug: #1866785 Change-Id: Ic205b4c6cf219f37025e6ddb61455e1d48ec480d (cherry picked from commit 6846341a60593f62d14795caa7bdb1c1cde7ce7b) --- puppet/services/neutron-ovs-agent.yaml | 5 ++++- puppet/services/opendaylight-ovs.yaml | 2 ++ puppet/services/ovn-controller.yaml | 6 ++++++ puppet/services/time/ptp.yaml | 6 ++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index e58ff52613..2a12a1b8be 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -44,6 +44,8 @@ parameters: scripts or be sure to keep 'datacentre' as a mapping network name. type: comma_delimited_list default: "datacentre:br-ex" + tags: + - role_specific NeutronTunnelTypes: default: 'vxlan' description: The tunnel types for the Neutron tenant network. @@ -83,6 +85,8 @@ parameters: description: | Enable OVS Hardware Offload. This feature supported from OVS 2.8.0 type: boolean + tags: + - role_specific OvsDisableEMC: default: false description: | @@ -102,7 +106,6 @@ parameters: Set additional ethertypes to to be configured on neutron firewalls. type: comma_delimited_list - conditions: no_firewall_driver: {equals : [{get_param: NeutronOVSFirewallDriver}, '']} ethertypes_unset: {equals : [{get_param: NeutronPermittedEthertypes}, []]} diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml index 5fe2b52256..04eec2b1da 100644 --- a/puppet/services/opendaylight-ovs.yaml +++ b/puppet/services/opendaylight-ovs.yaml @@ -96,6 +96,8 @@ parameters: description: | Enable OVS Hardware Offload. This feature supported from OVS 2.8.0 type: boolean + tags: + - role_specific EnableInternalTLS: type: boolean default: false diff --git a/puppet/services/ovn-controller.yaml b/puppet/services/ovn-controller.yaml index c103bf4ec0..f28542d0f4 100644 --- a/puppet/services/ovn-controller.yaml +++ b/puppet/services/ovn-controller.yaml @@ -44,6 +44,8 @@ parameters: scripts or be sure to keep 'datacentre' as a mapping network name. type: comma_delimited_list default: "datacentre:br-ex" + tags: + - role_specific OVNIntegrationBridge: description: > Name of the OVS bridge to use as integration bridge by OVN Controller. @@ -57,11 +59,15 @@ parameters: description: The CMS options to configure in ovs db type: string default: "" + tags: + - role_specific OvsHwOffload: default: false description: | Enable OVS Hardware Offload. This feature supported from OVS 2.8.0 type: boolean + tags: + - role_specific OVNRemoteProbeInterval: description: Probe interval in ms type: number diff --git a/puppet/services/time/ptp.yaml b/puppet/services/time/ptp.yaml index e01e2208da..da32746e45 100644 --- a/puppet/services/time/ptp.yaml +++ b/puppet/services/time/ptp.yaml @@ -39,14 +39,20 @@ parameters: default: nic1 description: PTP interface name. type: string + tags: + - role_specific PtpSlaveMode: default: 1 description: Configure PTP clock in slave mode. type: number + tags: + - role_specific PtpMessageTransport: default: UDPv4 description: Configure PTP message transport protocol. type: string + tags: + - role_specific resources: RoleParametersValue: