From 654c05df0e45aa47d18ce72e5ba003195872790f Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Fri, 22 Feb 2019 16:35:12 -0600 Subject: [PATCH] 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 --- .../controllerconfig/configassistant.py | 3 +-- .../controllerconfig/tests/files/cgcs_config.ceph | 15 +++++++++++++++ .../tests/files/cgcs_config.default | 15 +++++++++++++++ .../controllerconfig/tests/files/cgcs_config.ipv6 | 15 +++++++++++++++ .../tests/files/cgcs_config.region | 15 +++++++++++++++ .../tests/files/cgcs_config.region_nuage_vrs | 15 +++++++++++++++ 6 files changed, 76 insertions(+), 2 deletions(-) diff --git a/controllerconfig/controllerconfig/controllerconfig/configassistant.py b/controllerconfig/controllerconfig/controllerconfig/configassistant.py index e6dd7f5281..bcf87d3b5e 100644 --- a/controllerconfig/controllerconfig/controllerconfig/configassistant.py +++ b/controllerconfig/controllerconfig/controllerconfig/configassistant.py @@ -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" diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ceph b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ceph index 8a82a09d30..9759410104 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ceph +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ceph @@ -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 diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.default b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.default index d6ac24b6cb..8b5efab3cd 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.default +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.default @@ -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 diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ipv6 b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ipv6 index 98d93b251c..68401cbd2d 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ipv6 +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ipv6 @@ -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 diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region index 3bca0870e7..a7d5d57de0 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region @@ -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 diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs index 81036a9c20..86b55b180b 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs @@ -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