Browse Source

another fix for regression BZ#1770931

Change-Id: If7f7bf8fe0b18ac5e0aa7cb575e52592012221a4
(cherry picked from commit 1edb1afcf0)
tags/0.3.1^0
Dan Radez 3 months ago
parent
commit
920c4ac002
3 changed files with 7 additions and 6 deletions
  1. +4
    -4
      etc/ansible/roles/openstack-ml2/providers/junos/conf_trunk_port.yaml
  2. +1
    -1
      etc/ansible/roles/openstack-ml2/tasks/conf_trunk_port.yaml
  3. +2
    -1
      networking_ansible/ansible_networking.py

+ 4
- 4
etc/ansible/roles/openstack-ml2/providers/junos/conf_trunk_port.yaml View File

@@ -3,9 +3,9 @@
junos_command:
commands:
- config
- "delete interfaces {{ port_name }}"
- "set interfaces {{ port_name }} unit 0 family ethernet-switching interface-mode trunk"
- "set interfaces {{ port_name }} native-vlan {{ _vlan_id }}"
- "set interfaces {{ port_name }} unit 0 family ethernet-switching vlan members [{{ _vlan_id }}{% for vlan in trunked_vlans %} {{ vlan }}{% endfor %}]"
- "delete interfaces {{ ml2_port_name }}"
- "set interfaces {{ ml2_port_name }} unit 0 family ethernet-switching interface-mode trunk"
- "set interfaces {{ ml2_port_name }} native-vlan {{ ml2_segmentation_id }}"
- "set interfaces {{ ml2_port_name }} unit 0 family ethernet-switching vlan members [{{ ml2_segmentation_id }}{% for vlan in trunked_vlans %} {{ vlan }}{% endfor %}]"
- commit
connection: network_cli

+ 1
- 1
etc/ansible/roles/openstack-ml2/tasks/conf_trunk_port.yaml View File

@@ -16,4 +16,4 @@
- name: include and run device provider specific tasks
include_tasks: run.yaml
vars:
network_action: conf_trunk_port
ml2_resource: conf_trunk_port

+ 2
- 1
networking_ansible/ansible_networking.py View File

@@ -172,5 +172,6 @@ class AnsibleNetworking(object):
addition to the default VLAN.
"""
return self._run_task('conf_trunk_port',
hostname, port, vlan_id,
hostname, vlan_id,
switch_port=port,
trunked_vlans=trunked_vlans)

Loading…
Cancel
Save