The --kubernetes flag no longer has an effect.
kubernetes mode is always enabled, the flag cannot be used to enable or disable it. The option in the CLI will be removed completely once the wiki and any test tools are updated. The code that handles the "else" will also be updated in a later commit Story: 2004751 Task: 29756 Change-Id: I75a81ab852252ee108fefeca5682e5b1a9d7374e Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
parent
bf0aa2c78d
commit
654c05df0e
|
@ -326,8 +326,7 @@ class ConfigAssistant():
|
|||
"""
|
||||
|
||||
self.labmode = labmode
|
||||
# Temporary flag to be removed once kubernetes installs are the default
|
||||
self.kubernetes = kubernetes
|
||||
self.kubernetes = True
|
||||
|
||||
self.config_uuid = "install"
|
||||
|
||||
|
|
|
@ -39,6 +39,15 @@ CONTROLLER_INFRASTRUCTURE_HOSTNAME_SUFFIX=-infra
|
|||
INFRASTRUCTURE_START_ADDRESS=192.168.205.2
|
||||
INFRASTRUCTURE_END_ADDRESS=192.168.205.254
|
||||
|
||||
[cCLUSTER]
|
||||
# Cluster Host Network Configuration
|
||||
CLUSTER_INTERFACE_NAME=eth1
|
||||
CLUSTER_INTERFACE=eth1
|
||||
CLUSTER_VLAN=NC
|
||||
CLUSTER_MTU=1500
|
||||
CLUSTER_SUBNET=192.168.206.0/24
|
||||
LAG_CLUSTER_INTERFACE=no
|
||||
|
||||
[cEXT_OAM]
|
||||
# External OAM Network Configuration
|
||||
EXTERNAL_OAM_INTERFACE_NAME=eth0
|
||||
|
@ -52,6 +61,12 @@ EXTERNAL_OAM_FLOATING_ADDRESS=10.10.10.2
|
|||
EXTERNAL_OAM_0_ADDRESS=10.10.10.3
|
||||
EXTERNAL_OAM_1_ADDRESS=10.10.10.4
|
||||
|
||||
[cDNS]
|
||||
# DNS Configuration
|
||||
NAMESERVER_1=8.8.8.8
|
||||
NAMESERVER_2=8.8.4.4
|
||||
NAMESERVER_3=NC
|
||||
|
||||
[cNETWORK]
|
||||
# Data Network Configuration
|
||||
VSWITCH_TYPE=ovs-dpdk
|
||||
|
|
|
@ -45,6 +45,15 @@ CONTROLLER_INFRASTRUCTURE_HOSTNAME_SUFFIX=NC
|
|||
INFRASTRUCTURE_START_ADDRESS=NC
|
||||
INFRASTRUCTURE_END_ADDRESS=NC
|
||||
|
||||
[cCLUSTER]
|
||||
# Cluster Host Network Configuration
|
||||
CLUSTER_INTERFACE_NAME=eth1
|
||||
CLUSTER_INTERFACE=eth1
|
||||
CLUSTER_VLAN=NC
|
||||
CLUSTER_MTU=1500
|
||||
CLUSTER_SUBNET=192.168.206.0/24
|
||||
LAG_CLUSTER_INTERFACE=no
|
||||
|
||||
[cEXT_OAM]
|
||||
# External OAM Network Configuration
|
||||
EXTERNAL_OAM_INTERFACE_NAME=eth0
|
||||
|
@ -58,6 +67,12 @@ EXTERNAL_OAM_FLOATING_ADDRESS=10.10.10.2
|
|||
EXTERNAL_OAM_0_ADDRESS=10.10.10.3
|
||||
EXTERNAL_OAM_1_ADDRESS=10.10.10.4
|
||||
|
||||
[cDNS]
|
||||
# DNS Configuration
|
||||
NAMESERVER_1=8.8.8.8
|
||||
NAMESERVER_2=8.8.4.4
|
||||
NAMESERVER_3=NC
|
||||
|
||||
[cNETWORK]
|
||||
# Data Network Configuration
|
||||
VSWITCH_TYPE=ovs-dpdk
|
||||
|
|
|
@ -45,6 +45,15 @@ CONTROLLER_INFRASTRUCTURE_HOSTNAME_SUFFIX=NC
|
|||
INFRASTRUCTURE_START_ADDRESS=NC
|
||||
INFRASTRUCTURE_END_ADDRESS=NC
|
||||
|
||||
[cCLUSTER]
|
||||
# Cluster Host Network Configuration
|
||||
CLUSTER_INTERFACE_NAME=eth1
|
||||
CLUSTER_INTERFACE=eth1
|
||||
CLUSTER_VLAN=NC
|
||||
CLUSTER_MTU=1500
|
||||
CLUSTER_SUBNET=192.168.206.0/24
|
||||
LAG_CLUSTER_INTERFACE=no
|
||||
|
||||
[cEXT_OAM]
|
||||
# External OAM Network Configuration
|
||||
EXTERNAL_OAM_INTERFACE_NAME=eth0
|
||||
|
@ -58,6 +67,12 @@ EXTERNAL_OAM_FLOATING_ADDRESS=abcd::2
|
|||
EXTERNAL_OAM_0_ADDRESS=abcd::3
|
||||
EXTERNAL_OAM_1_ADDRESS=abcd::4
|
||||
|
||||
[cDNS]
|
||||
# DNS Configuration
|
||||
NAMESERVER_1=8.8.8.8
|
||||
NAMESERVER_2=8.8.4.4
|
||||
NAMESERVER_3=NC
|
||||
|
||||
[cNETWORK]
|
||||
# Data Network Configuration
|
||||
VSWITCH_TYPE=ovs-dpdk
|
||||
|
|
|
@ -47,6 +47,15 @@ CONTROLLER_INFRASTRUCTURE_HOSTNAME_SUFFIX=NC
|
|||
INFRASTRUCTURE_START_ADDRESS=NC
|
||||
INFRASTRUCTURE_END_ADDRESS=NC
|
||||
|
||||
[cCLUSTER]
|
||||
# Cluster Host Network Configuration
|
||||
CLUSTER_INTERFACE_NAME=eth1
|
||||
CLUSTER_INTERFACE=eth1
|
||||
CLUSTER_VLAN=NC
|
||||
CLUSTER_MTU=1500
|
||||
CLUSTER_SUBNET=192.168.206.0/24
|
||||
LAG_CLUSTER_INTERFACE=no
|
||||
|
||||
[cEXT_OAM]
|
||||
# External OAM Network Configuration
|
||||
EXTERNAL_OAM_INTERFACE_NAME=eth0
|
||||
|
@ -60,6 +69,12 @@ EXTERNAL_OAM_FLOATING_ADDRESS=10.10.10.2
|
|||
EXTERNAL_OAM_0_ADDRESS=10.10.10.3
|
||||
EXTERNAL_OAM_1_ADDRESS=10.10.10.4
|
||||
|
||||
[cDNS]
|
||||
# DNS Configuration
|
||||
NAMESERVER_1=8.8.8.8
|
||||
NAMESERVER_2=8.8.4.4
|
||||
NAMESERVER_3=NC
|
||||
|
||||
[cNETWORK]
|
||||
# Data Network Configuration
|
||||
VSWITCH_TYPE=ovs-dpdk
|
||||
|
|
|
@ -47,6 +47,15 @@ CONTROLLER_INFRASTRUCTURE_HOSTNAME_SUFFIX=NC
|
|||
INFRASTRUCTURE_START_ADDRESS=NC
|
||||
INFRASTRUCTURE_END_ADDRESS=NC
|
||||
|
||||
[cCLUSTER]
|
||||
# Cluster Host Network Configuration
|
||||
CLUSTER_INTERFACE_NAME=eth1
|
||||
CLUSTER_INTERFACE=eth1
|
||||
CLUSTER_VLAN=NC
|
||||
CLUSTER_MTU=1500
|
||||
CLUSTER_SUBNET=192.168.206.0/24
|
||||
LAG_CLUSTER_INTERFACE=no
|
||||
|
||||
[cEXT_OAM]
|
||||
# External OAM Network Configuration
|
||||
EXTERNAL_OAM_INTERFACE_NAME=eth0
|
||||
|
@ -60,6 +69,12 @@ EXTERNAL_OAM_FLOATING_ADDRESS=10.10.10.2
|
|||
EXTERNAL_OAM_0_ADDRESS=10.10.10.3
|
||||
EXTERNAL_OAM_1_ADDRESS=10.10.10.4
|
||||
|
||||
[cDNS]
|
||||
# DNS Configuration
|
||||
NAMESERVER_1=8.8.8.8
|
||||
NAMESERVER_2=8.8.4.4
|
||||
NAMESERVER_3=NC
|
||||
|
||||
[cNETWORK]
|
||||
# Data Network Configuration
|
||||
VSWITCH_TYPE=nuage_vrs
|
||||
|
|
Loading…
Reference in New Issue