Rename network device field

It seems much nicer and more consistent as "device" rather than as
"name".
This commit is contained in:
Joshua Boniface 2019-06-17 23:44:41 -04:00
parent 1d3f868206
commit d4ebe63d9b
2 changed files with 12 additions and 12 deletions

View File

@ -126,25 +126,25 @@ pvc:
networking: networking:
# upstream: Upstream physical interface device # upstream: Upstream physical interface device
upstream: upstream:
# name: Upstream interface name # device: Upstream interface device name
name: ens4 device: ens4
# mtu: Upstream interface MTU; use 9000 for jumbo frames (requires switch support) # mtu: Upstream interface MTU; use 9000 for jumbo frames (requires switch support)
mtu: 1500 mtu: 1500
# address: Network address for upstream network, options: None, by-id, <static>/<mask> # address: Upstream interface IP address, options: None, by-id, <static>/<mask>
address: None address: None
# cluster: Cluster (VNIC) physical interface device # cluster: Cluster (VNIC) physical interface device
cluster: cluster:
# name: Cluster (VNIC) interface name # device: Cluster (VNIC) interface device name
name: ens4 device: ens4
# mtu: Cluster (VNIC) interface MTU; use 9000 for jumbo frames (requires switch support) # mtu: Cluster (VNIC) interface MTU; use 9000 for jumbo frames (requires switch support)
mtu: 1500 mtu: 1500
# address: Network address for cluster network, options: by-id, <static>/<mask> # address: Cluster (VNIC) interface IP address, options: None, by-id, <static>/<mask>
address: by-id address: by-id
# storage: Storage (Ceph OSD) physical interface device # storage: Storage (Ceph OSD) physical interface device
storage: storage:
# name: Storace (Ceph OSD) interface name # device: Storage (Ceph OSD) interface device name
name: ens4 device: ens4
# mtu: Storage (Ceph OSD) interface MTU; use 9000 for jumbo frames (requires switch support) # mtu: Storage (Ceph OSD) interface MTU; use 9000 for jumbo frames (requires switch support)
mtu: 1500 mtu: 1500
# address: Network address for storage network, options: by-id, <static>/<mask> # address: Storage (Ceph OSD) interface IP address, options: None, by-id, <static>/<mask>
address: by-id address: by-id

View File

@ -179,13 +179,13 @@ def readConfig(pvcd_config_file, myhostname):
'pdns_postgresql_dbname': o_config['pvc']['coordinator']['dns']['database']['name'], 'pdns_postgresql_dbname': o_config['pvc']['coordinator']['dns']['database']['name'],
'pdns_postgresql_user': o_config['pvc']['coordinator']['dns']['database']['user'], 'pdns_postgresql_user': o_config['pvc']['coordinator']['dns']['database']['user'],
'pdns_postgresql_password': o_config['pvc']['coordinator']['dns']['database']['pass'], '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_mtu': o_config['pvc']['system']['configuration']['networking']['cluster']['mtu'],
'vni_dev_ip': o_config['pvc']['system']['configuration']['networking']['cluster']['address'], '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_mtu': o_config['pvc']['system']['configuration']['networking']['storage']['mtu'],
'storage_dev_ip': o_config['pvc']['system']['configuration']['networking']['storage']['address'], '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_mtu': o_config['pvc']['system']['configuration']['networking']['upstream']['mtu'],
'upstream_dev_ip': o_config['pvc']['system']['configuration']['networking']['upstream']['address'], 'upstream_dev_ip': o_config['pvc']['system']['configuration']['networking']['upstream']['address'],
} }