Merge "Update tsconfig for cluster-host interface"

changes/10/657010/1
Zuul 4 years ago committed by Gerrit Code Review
commit 0d4c98bd89
  1. 4
      tsconfig/tsconfig/tsconfig/tests/test_basics.py
  2. 10
      tsconfig/tsconfig/tsconfig/tsconfig.py

@ -55,7 +55,7 @@ http_port=8080
INSTALL_UUID=ab0a5348-cea7-4b08-b1b0-09d5527dd227
UUID=a1c581fc-0c74-4e68-b78e-4e26a0695f5d
oam_interface=enp0s3
infrastructure_interface=enp0s4
cluster_host_interface=enp0s4
sdn_enabled=no
region_config=no
system_mode=duplex
@ -74,7 +74,7 @@ http_port=8081
INSTALL_UUID=ab0a5348-cea7-4b08-b1b0-09d5527dd227
UUID=a1c581fc-0c74-4e68-b78e-4e26a0695f5d
oam_interface=enp0s3
infrastructure_interface=enp0s4
cluster_host_interface=enp0s4
sdn_enabled=no
region_config=no
region_1_name=Region1

@ -23,7 +23,7 @@ region_2_name = None
vswitch_type = None
management_interface = None
oam_interface = None
infrastructure_interface = None
cluster_host_interface = None
sdn_enabled = "no"
host_uuid = None
install_uuid = None
@ -111,10 +111,10 @@ def _load():
if config.has_option('platform_conf', 'oam_interface'):
oam_interface = str(config.get('platform_conf', 'oam_interface'))
global infrastructure_interface
if config.has_option('platform_conf', 'infrastructure_interface'):
infrastructure_interface = str(config.get('platform_conf',
'infrastructure_interface'))
global cluster_host_interface
if config.has_option('platform_conf', 'cluster_host_interface'):
cluster_host_interface = str(config.get('platform_conf',
'cluster_host_interface'))
global sdn_enabled
if config.has_option('platform_conf', 'sdn_enabled'):
sdn_enabled = str(config.get('platform_conf', 'sdn_enabled'))

Loading…
Cancel
Save