From 97fc5bcfe6240719bca6a10f835503453ff90120 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Thu, 25 Mar 2021 15:17:04 +0100 Subject: [PATCH] Remove neutron-l3-compute-dvr referenced nowhere deployment/neutron/neutron-l3-compute-dvr.yaml has no references in tht, and also it points the baremetal puppet configuration. We only support it containerized. Change-Id: Idc40c2320ba3d9643d2430150238a72d3775a1b0 Signed-off-by: Bogdan Dobrelya --- .../neutron/neutron-l3-compute-dvr.yaml | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 deployment/neutron/neutron-l3-compute-dvr.yaml diff --git a/deployment/neutron/neutron-l3-compute-dvr.yaml b/deployment/neutron/neutron-l3-compute-dvr.yaml deleted file mode 100644 index 0505b8540f..0000000000 --- a/deployment/neutron/neutron-l3-compute-dvr.yaml +++ /dev/null @@ -1,69 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack Neutron L3 agent for DVR enabled compute nodes - configured with Puppet - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - MonitoringSubscriptionNeutronL3Dvr: - default: 'overcloud-neutron-l3-dvr' - type: string - NeutronL3ComputeAgentLoggingSource: - type: json - default: - tag: openstack.neutron.agent.l3-compute - file: /var/log/neutron/l3-agent.log - - -resources: - - NeutronBase: - type: ./neutron-base.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for DVR L3 Agent on Compute Nodes - value: - service_name: neutron_l3_compute_dvr - monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3Dvr} - config_settings: - map_merge: - - get_attr: [NeutronBase, role_data, config_settings] - - neutron::agents::l3::agent_mode : 'dvr' - service_config_settings: - rsyslog: - tripleo_logging_sources_neutron_l3_compute_dvr: - - {get_param: NeutronL3ComputeAgentLoggingSource} - step_config: | - include tripleo::profile::base::neutron::l3 - metadata_settings: - get_attr: [NeutronBase, role_data, metadata_settings]