starlingx
/
update
Code Issues Proposed changes

Update tsconfig for cluster-host interface 

Updated tsconfig to read the cluster_host_interface instead of
infrastructure_interface parameter in /etc/platform/platform.conf.

Story: 2004273
Task: 30517
Depends-On: https://review.openstack.org/#/c/652713/
Depends-On: https://review.openstack.org/#/c/652773/

Change-Id: I2641c0961f5dff114cb612695b76ac72a80c7554
Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
This commit is contained in:
Teresa Ho 2019-04-14 20:54:42 -04:00
parent 181b1e46d0
commit 445686f1cf
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tsconfig/tsconfig/tsconfig/tests/test_basics.py
View File

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

10
tsconfig/tsconfig/tsconfig/tsconfig.py
View File

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