starlingx
/
update
Code Issues Proposed changes

Change compute node to worker node personality 

Replace patch compute references to to worker.
Replace the compute configuration flags in tsconfig.

Tests Performed:
Non-containerized deployment
AIO-SX: Sanity and Nightly automated test suite
AIO-DX: Sanity and Nightly automated test suite
2+2 System: Sanity and Nightly automated test suite
2+2 System: Horizon Patch Orchestration

Kubernetes deployment:
AIO-SX: Create, delete, reboot and rebuild instances
2+2+2 System: worker nodes are unlock enable and no alarms

patch_build.sh with the following options:
'--worker', '--worker-lowlatency",
'--controller-worker'
'--controller-worker-lowlatency'

Story: 2004022
Task: 27013

Depends-On: https://review.openstack.org/#/c/624452/

Change-Id: If6f7bb6a73db54203941a9657f9152453d270e86
Signed-off-by: Tao Liu <tao.liu@windriver.com>
This commit is contained in:
Tao Liu 2018-12-11 19:47:35 -05:00
parent 572866ebba
commit 7ac96439f4
5 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cgcs-patch/bin/patch-functions
View File

@ -30,9 +30,9 @@ function is_controller()
[[ $nodetype == "controller" ]]
}
function is_compute()
function is_worker()
{
[[ $nodetype == "compute" ]]
[[ $nodetype == "worker" ]]
}
function is_storage()
@ -42,7 +42,7 @@ function is_storage()
function is_cpe()
{
[[ $nodetype == "controller" && $subfunction =~ compute ]]
[[ $nodetype == "controller" && $subfunction =~ worker ]]
}
function is_locked()

36
cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
View File

@ -1,5 +1,5 @@
"""
Copyright (c) 2014-2017 Wind River Systems, Inc.
Copyright (c) 2014-2018 Wind River Systems, Inc.
SPDX-License-Identifier: Apache-2.0
@ -434,7 +434,7 @@ class PatchData:
# <status>Dev</status>
# <unremovable/>
# <reboot_required/>
# <personality type="compute">
# <personality type="worker">
# <package>pkgA</package>
# <package>pkgB</package>
# </personality>
@ -1181,10 +1181,10 @@ def patch_build():
'inst=',
'req=',
'controller=',
'controller-compute=',
'controller-compute-lowlatency=',
'compute=',
'compute-lowlatency=',
'controller-worker=',
'controller-worker-lowlatency=',
'worker=',
'worker-lowlatency=',
'storage=',
'all-nodes='])
except getopt.GetoptError:
@ -1202,11 +1202,11 @@ def patch_build():
print("\t--inst <instructions> Patch Install Instructions")
print("\t--req <patch_id> Required Patch")
print("\t--controller <rpm> New package for controller")
print("\t--compute <rpm> New package for compute node")
print("\t--compute-lowlatency <rpm> New package for compute-lowlatency node")
print("\t--worker <rpm> New package for worker node")
print("\t--worker-lowlatency <rpm> New package for worker-lowlatency node")
print("\t--storage <rpm> New package for storage node")
print("\t--controller-compute <rpm> New package for combined node")
print("\t--controller-compute-lowlatency <rpm> New package for lowlatency combined node")
print("\t--controller-worker <rpm> New package for combined node")
print("\t--controller-worker-lowlatency <rpm> New package for lowlatency combined node")
print("\t--all-nodes <rpm> New package for all node types")
exit(1)
@ -1241,18 +1241,18 @@ def patch_build():
pf.meta.requires.append(arg)
elif opt == "--all-nodes":
for p in ("controller",
"compute",
"compute-lowlatency",
"worker",
"worker-lowlatency",
"storage",
"controller-compute",
"controller-compute-lowlatency"):
"controller-worker",
"controller-worker-lowlatency"):
pf.add_rpm(arg, personality=p)
elif opt in ("--controller",
"--compute",
"--compute-lowlatency",
"--worker",
"--worker-lowlatency",
"--storage",
"--controller-compute",
"--controller-compute-lowlatency"):
"--controller-worker",
"--controller-worker-lowlatency"):
pf.add_rpm(arg, personality=opt[2:])
if pf.meta.id is None:

8
cgcs-patch/restart-info.html
View File

@ -211,13 +211,13 @@ table, th, td {
<td>N</td>
<td>Will cause neutron services to not be available while restarting,
which will prevent instances from being created while it is down.
Could cause RPCs from computes to fail while it is restarting.
Could cause RPCs from workers to fail while it is restarting.
</td>
<td>N</td>
</tr>
<tr>
<td><font color="blue">neutron-dhcp-agent</font></td>
<td>Agent on compute node that manages DHCP servers for tenant
<td>Agent on worker node that manages DHCP servers for tenant
networks
</td>
<td>Y</td>
@ -232,7 +232,7 @@ table, th, td {
</tr>
<tr>
<td><font color="blue">neutron-metadata-agent</font></td>
<td>Agent on compute node serving metadata to nodes</td>
<td>Agent on worker node serving metadata to nodes</td>
<td>Y</td>
<td>PMON</td>
<td><b>/etc/init.d/neutron-metadata-agent restart</b></td>
@ -243,7 +243,7 @@ table, th, td {
</tr>
<tr>
<td><font color="blue">neutron-sriov-nic-agent</font></td>
<td>Agent on compute node responsible for setting SR-IOV port
<td>Agent on worker node responsible for setting SR-IOV port
information
</td>
<td>Y</td>

14
tsconfig/scripts/tsconfig
View File

@ -16,14 +16,14 @@ CONFIG_PATH=${PLATFORM_PATH}/config/${SW_VERSION}
PUPPET_PATH=${PLATFORM_PATH}/puppet/${SW_VERSION}
CGCS_PATH=/opt/cgcs
# Compute configuration flags
# Worker configuration flags
# Set after the first application of compute manifests
INITIAL_COMPUTE_CONFIG_COMPLETE=${PLATFORM_CONF_PATH}/.initial_compute_config_complete
# Set after each application of compute manifests
VOLATILE_COMPUTE_CONFIG_COMPLETE=${VOLATILE_PATH}/.compute_config_complete
# Set to prevent starting compute services (used in combined node upgrade)
VOLATILE_DISABLE_COMPUTE_SERVICES=${VOLATILE_PATH}/.disable_compute_services
# Set after the first application of worker manifests
INITIAL_WORKER_CONFIG_COMPLETE=${PLATFORM_CONF_PATH}/.initial_worker_config_complete
# Set after each application of worker manifests
VOLATILE_WORKER_CONFIG_COMPLETE=${VOLATILE_PATH}/.worker_config_complete
# Set to prevent starting worker services (used in combined node upgrade)
VOLATILE_DISABLE_WORKER_SERVICES=${VOLATILE_PATH}/.disable_worker_services
# Upgrade flags

22
tsconfig/tsconfig/tsconfig/tsconfig.py
View File

@ -1,5 +1,5 @@
"""
Copyright (c) 2014-2016 Wind River Systems, Inc.
Copyright (c) 2014-2018 Wind River Systems, Inc.
SPDX-License-Identifier: Apache-2.0
@ -179,20 +179,20 @@ INITIAL_CONTROLLER_CONFIG_COMPLETE = os.path.join(
VOLATILE_CONTROLLER_CONFIG_COMPLETE = os.path.join(
VOLATILE_PATH, ".controller_config_complete")
# Compute configuration flags
# Worker configuration flags
# Set after initial application of node manifest
INITIAL_CONFIG_COMPLETE_FLAG = os.path.join(
PLATFORM_CONF_PATH, ".initial_config_complete")
# Set after the first application of compute manifests
INITIAL_COMPUTE_CONFIG_COMPLETE = os.path.join(
PLATFORM_CONF_PATH, ".initial_compute_config_complete")
# Set after each application of compute manifests
VOLATILE_COMPUTE_CONFIG_COMPLETE = os.path.join(
VOLATILE_PATH, ".compute_config_complete")
# Set to prevent starting compute services (used in combined node upgrade)
VOLATILE_DISABLE_COMPUTE_SERVICES = os.path.join(
VOLATILE_PATH, ".disable_compute_services")
# Set after the first application of worker manifests
INITIAL_WORKER_CONFIG_COMPLETE = os.path.join(
PLATFORM_CONF_PATH, ".initial_worker_config_complete")
# Set after each application of worker manifests
VOLATILE_WORKER_CONFIG_COMPLETE = os.path.join(
VOLATILE_PATH, ".worker_config_complete")
# Set to prevent starting worker services (used in combined node upgrade)
VOLATILE_DISABLE_WORKER_SERVICES = os.path.join(
VOLATILE_PATH, ".disable_worker_services")
# Storage configuration flags