From cd7cdf2719dbfd7b0bc7a3c72e4f0c056fb3548c Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 6 Jan 2020 14:35:25 -0500 Subject: [PATCH] Add bridge_device entry to config Used to properly allow bridged networks to be formed. Ref https://git.bonifacelabs.ca/parallelvirtualcluster/pvc/issues/64 --- group_vars/default/pvc.yml | 8 ++++++++ roles/pvc/templates/pvc/pvcd.yaml.j2 | 1 + 2 files changed, 9 insertions(+) diff --git a/group_vars/default/pvc.yml b/group_vars/default/pvc.yml index 8e046d7..52a6e7b 100644 --- a/group_vars/default/pvc.yml +++ b/group_vars/default/pvc.yml @@ -80,6 +80,14 @@ pvc_nodes: ipmi_user: "{{ username_ipmi_host }}" ipmi_password: "{{ passwd_ipmi_host }}" +# Bridge device entry +# This device is passed to PVC and is used when creating bridged networks. Normal managed networks are +# created on top of the "cluster" interface defined below, however bridged networks must be created +# directly on an underlying non-vLAN network device. This can be the same underlying device as the +# upstream/cluster/storage networks (especially if the upstream network device is not a vLAN itself), +# or a different device separate from the other 3 main networks. +pvc_bridge_device: bondU # Replace based on your network configuration + # Configuration file networks # > Taken from base.yml's configuration; do not modify this section. pvc_upstream_device: "{{ networks['upstream']['device'] }}" diff --git a/roles/pvc/templates/pvc/pvcd.yaml.j2 b/roles/pvc/templates/pvc/pvcd.yaml.j2 index 6781be3..8556d63 100644 --- a/roles/pvc/templates/pvc/pvcd.yaml.j2 +++ b/roles/pvc/templates/pvc/pvcd.yaml.j2 @@ -77,6 +77,7 @@ pvc: log_keepalive_storage_details: {{ pvc_log_keepalive_storage_details }} console_log_lines: {{ pvc_log_console_lines }} networking: + bridge_device: {{ pvc_bridge_device }} upstream: device: {{ pvc_upstream_device }} mtu: {{ pvc_upstream_mtu }}