From d4ebe63d9bfce3f67a98b6aed3a152c59df3cfa1 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 17 Jun 2019 23:44:41 -0400 Subject: [PATCH] Rename network device field It seems much nicer and more consistent as "device" rather than as "name". --- node-daemon/pvcd.sample.yaml | 18 +++++++++--------- node-daemon/pvcd/Daemon.py | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/node-daemon/pvcd.sample.yaml b/node-daemon/pvcd.sample.yaml index d8ffb835..58b95b74 100644 --- a/node-daemon/pvcd.sample.yaml +++ b/node-daemon/pvcd.sample.yaml @@ -126,25 +126,25 @@ pvc: networking: # upstream: Upstream physical interface device upstream: - # name: Upstream interface name - name: ens4 + # device: Upstream interface device name + device: ens4 # mtu: Upstream interface MTU; use 9000 for jumbo frames (requires switch support) mtu: 1500 - # address: Network address for upstream network, options: None, by-id, / + # address: Upstream interface IP address, options: None, by-id, / address: None # cluster: Cluster (VNIC) physical interface device cluster: - # name: Cluster (VNIC) interface name - name: ens4 + # device: Cluster (VNIC) interface device name + device: ens4 # mtu: Cluster (VNIC) interface MTU; use 9000 for jumbo frames (requires switch support) mtu: 1500 - # address: Network address for cluster network, options: by-id, / + # address: Cluster (VNIC) interface IP address, options: None, by-id, / address: by-id # storage: Storage (Ceph OSD) physical interface device storage: - # name: Storace (Ceph OSD) interface name - name: ens4 + # device: Storage (Ceph OSD) interface device name + device: ens4 # mtu: Storage (Ceph OSD) interface MTU; use 9000 for jumbo frames (requires switch support) mtu: 1500 - # address: Network address for storage network, options: by-id, / + # address: Storage (Ceph OSD) interface IP address, options: None, by-id, / address: by-id diff --git a/node-daemon/pvcd/Daemon.py b/node-daemon/pvcd/Daemon.py index ef38fe74..6e5d630b 100644 --- a/node-daemon/pvcd/Daemon.py +++ b/node-daemon/pvcd/Daemon.py @@ -179,13 +179,13 @@ def readConfig(pvcd_config_file, myhostname): 'pdns_postgresql_dbname': o_config['pvc']['coordinator']['dns']['database']['name'], 'pdns_postgresql_user': o_config['pvc']['coordinator']['dns']['database']['user'], 'pdns_postgresql_password': o_config['pvc']['coordinator']['dns']['database']['pass'], - 'vni_dev': o_config['pvc']['system']['configuration']['networking']['cluster']['name'], + 'vni_dev': o_config['pvc']['system']['configuration']['networking']['cluster']['device'], 'vni_mtu': o_config['pvc']['system']['configuration']['networking']['cluster']['mtu'], 'vni_dev_ip': o_config['pvc']['system']['configuration']['networking']['cluster']['address'], - 'storage_dev': o_config['pvc']['system']['configuration']['networking']['storage']['name'], + 'storage_dev': o_config['pvc']['system']['configuration']['networking']['storage']['device'], 'storage_mtu': o_config['pvc']['system']['configuration']['networking']['storage']['mtu'], 'storage_dev_ip': o_config['pvc']['system']['configuration']['networking']['storage']['address'], - 'upstream_dev': o_config['pvc']['system']['configuration']['networking']['upstream']['name'], + 'upstream_dev': o_config['pvc']['system']['configuration']['networking']['upstream']['device'], 'upstream_mtu': o_config['pvc']['system']['configuration']['networking']['upstream']['mtu'], 'upstream_dev_ip': o_config['pvc']['system']['configuration']['networking']['upstream']['address'], }