Change compute node to worker node personality
This update replaces compute references to worker in mtce, kickstarts, installer and bsp files. 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 Story: 2004022 Task: 27013 Depends-On: https://review.openstack.org/#/c/624452/ Change-Id: I225f7d7143d841f80459603b27b95ac3f846c46f Signed-off-by: Tao Liu <tao.liu@windriver.com>
This commit is contained in:
parent
8eb55b2b03
commit
9661e49411
@ -47,7 +47,7 @@ write_config_file("controller",
|
||||
"post_kernel_controller.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_usb_controller.cfg");
|
||||
write_config_file("controller-compute",
|
||||
write_config_file("controller-worker",
|
||||
"${output_dir}/smallsystem_ks.cfg", "filter_out_from_smallsystem",
|
||||
"pre_common_head.cfg",
|
||||
"pre_pkglist.cfg",
|
||||
@ -55,11 +55,11 @@ write_config_file("controller-compute",
|
||||
"pre_disk_aio.cfg",
|
||||
"post_platform_conf_aio.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_system_aio.cfg",
|
||||
"post_usb_controller.cfg");
|
||||
write_config_file("controller-compute-lowlatency",
|
||||
write_config_file("controller-worker-lowlatency",
|
||||
"${output_dir}/smallsystem_lowlatency_ks.cfg", "filter_out_from_smallsystem_lowlatency",
|
||||
"pre_common_head.cfg",
|
||||
"pre_pkglist_lowlatency.cfg",
|
||||
@ -67,7 +67,7 @@ write_config_file("controller-compute-lowlatency",
|
||||
"pre_disk_aio.cfg",
|
||||
"post_platform_conf_aio_lowlatency.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_system_aio.cfg",
|
||||
"post_usb_controller.cfg");
|
||||
@ -86,7 +86,7 @@ write_config_file("controller",
|
||||
"post_kernel_controller.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_pxeboot_controller.cfg");
|
||||
write_config_file("controller-compute",
|
||||
write_config_file("controller-worker",
|
||||
"${pxeboot_output_dir}/pxeboot_smallsystem.cfg", "filter_out_from_smallsystem",
|
||||
"pre_common_head.cfg",
|
||||
"pre_pkglist.cfg",
|
||||
@ -94,11 +94,11 @@ write_config_file("controller-compute",
|
||||
"pre_disk_aio.cfg",
|
||||
"post_platform_conf_aio.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_system_aio.cfg",
|
||||
"post_pxeboot_controller.cfg");
|
||||
write_config_file("controller-compute-lowlatency",
|
||||
write_config_file("controller-worker-lowlatency",
|
||||
"${pxeboot_output_dir}/pxeboot_smallsystem_lowlatency.cfg", "filter_out_from_smallsystem_lowlatency",
|
||||
"pre_common_head.cfg",
|
||||
"pre_pkglist_lowlatency.cfg",
|
||||
@ -106,7 +106,7 @@ write_config_file("controller-compute-lowlatency",
|
||||
"pre_disk_aio.cfg",
|
||||
"post_platform_conf_aio_lowlatency.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_system_aio.cfg",
|
||||
"post_pxeboot_controller.cfg");
|
||||
@ -126,7 +126,7 @@ write_config_file("controller",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_net_controller.cfg",
|
||||
"post_net_common.cfg");
|
||||
write_config_file("controller-compute",
|
||||
write_config_file("controller-worker",
|
||||
"${output_dir}/net_smallsystem_ks.cfg", "filter_out_from_smallsystem",
|
||||
"pre_common_head.cfg",
|
||||
"pre_net_common.cfg",
|
||||
@ -135,12 +135,12 @@ write_config_file("controller-compute",
|
||||
"pre_disk_aio.cfg",
|
||||
"post_platform_conf_aio.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_system_aio.cfg",
|
||||
"post_net_controller.cfg",
|
||||
"post_net_common.cfg");
|
||||
write_config_file("controller-compute-lowlatency",
|
||||
write_config_file("controller-worker-lowlatency",
|
||||
"${output_dir}/net_smallsystem_lowlatency_ks.cfg", "filter_out_from_smallsystem_lowlatency",
|
||||
"pre_common_head.cfg",
|
||||
"pre_net_common.cfg",
|
||||
@ -149,33 +149,33 @@ write_config_file("controller-compute-lowlatency",
|
||||
"pre_disk_aio.cfg",
|
||||
"post_platform_conf_aio_lowlatency.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_system_aio.cfg",
|
||||
"post_net_controller.cfg",
|
||||
"post_net_common.cfg");
|
||||
write_config_file("compute",
|
||||
"${output_dir}/net_compute_ks.cfg", "filter_out_from_compute",
|
||||
write_config_file("worker",
|
||||
"${output_dir}/net_worker_ks.cfg", "filter_out_from_worker",
|
||||
"pre_common_head.cfg",
|
||||
"pre_net_common.cfg",
|
||||
"pre_pkglist.cfg",
|
||||
"pre_disk_setup_common.cfg",
|
||||
"pre_disk_compute.cfg",
|
||||
"post_platform_conf_compute.cfg",
|
||||
"pre_disk_worker.cfg",
|
||||
"post_platform_conf_worker.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_no_pv_on_rootfs.cfg",
|
||||
"post_net_common.cfg");
|
||||
write_config_file("compute-lowlatency",
|
||||
"${output_dir}/net_compute_lowlatency_ks.cfg", "filter_out_from_compute_lowlatency",
|
||||
write_config_file("worker-lowlatency",
|
||||
"${output_dir}/net_worker_lowlatency_ks.cfg", "filter_out_from_worker_lowlatency",
|
||||
"pre_common_head.cfg",
|
||||
"pre_net_common.cfg",
|
||||
"pre_pkglist_lowlatency.cfg",
|
||||
"pre_disk_setup_common.cfg",
|
||||
"pre_disk_compute.cfg",
|
||||
"post_platform_conf_compute_lowlatency.cfg",
|
||||
"pre_disk_worker.cfg",
|
||||
"post_platform_conf_worker_lowlatency.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_no_pv_on_rootfs.cfg",
|
||||
"post_net_common.cfg");
|
||||
write_config_file("storage",
|
||||
@ -210,7 +210,7 @@ foreach $server (keys %boot_servers)
|
||||
"post_kernel_controller.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_yow_controller.cfg");
|
||||
write_config_file("controller-compute",
|
||||
write_config_file("controller-worker",
|
||||
"${extra_output_dir}/${server}_smallsystem.cfg", "filter_out_from_smallsystem",
|
||||
"pre_common_head.cfg",
|
||||
"pre_pkglist.cfg",
|
||||
@ -218,11 +218,11 @@ foreach $server (keys %boot_servers)
|
||||
"pre_disk_aio.cfg",
|
||||
"post_platform_conf_aio.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_system_aio.cfg",
|
||||
"post_yow_controller.cfg");
|
||||
write_config_file("controller-compute-lowlatency",
|
||||
write_config_file("controller-worker-lowlatency",
|
||||
"${extra_output_dir}/${server}_smallsystem_lowlatency.cfg", "filter_out_from_smallsystem_lowlatency",
|
||||
"pre_common_head.cfg",
|
||||
"pre_pkglist_lowlatency.cfg",
|
||||
@ -230,7 +230,7 @@ foreach $server (keys %boot_servers)
|
||||
"pre_disk_aio.cfg",
|
||||
"post_platform_conf_aio_lowlatency.cfg",
|
||||
"post_common.cfg",
|
||||
"post_kernel_aio_and_compute.cfg",
|
||||
"post_kernel_aio_and_worker.cfg",
|
||||
"post_lvm_pv_on_rootfs.cfg",
|
||||
"post_system_aio.cfg",
|
||||
"post_yow_controller.cfg");
|
||||
|
@ -1,8 +1,8 @@
|
||||
task-cloud-compute
|
||||
compute-huge
|
||||
computeconfig
|
||||
computeconfig-standalone
|
||||
computeconfig-subfunction
|
||||
worker-utils
|
||||
workerconfig
|
||||
workerconfig-standalone
|
||||
workerconfig-subfunction
|
||||
guest-scale-helper
|
||||
heartbeat
|
||||
storageconfig
|
||||
@ -27,7 +27,7 @@ host-guest-comm-dev
|
||||
nfscheck
|
||||
radvd
|
||||
remote-clients
|
||||
config-gate-compute
|
||||
config-gate-worker
|
||||
kernel-rt
|
||||
kernel-module-igb-uio
|
||||
kernel-module-igb-uio-rt
|
||||
|
@ -1,7 +1,7 @@
|
||||
cgcs-dpdk-rt
|
||||
cgcs-dpdk-rt-apps
|
||||
mtce-storage
|
||||
computeconfig-standalone
|
||||
workerconfig-standalone
|
||||
kernel-module-openvswitch
|
||||
platform-util-noncontroller
|
||||
storageconfig
|
||||
|
@ -1,7 +1,7 @@
|
||||
cgcs-dpdk
|
||||
cgcs-dpdk-apps
|
||||
mtce-storage
|
||||
computeconfig-standalone
|
||||
workerconfig-standalone
|
||||
kernel-module-openvswitch
|
||||
platform-util-noncontroller
|
||||
storageconfig
|
||||
|
@ -25,10 +25,10 @@ cinder-api
|
||||
cinder-scheduler
|
||||
cinder-tests
|
||||
cinder-volume
|
||||
compute-huge
|
||||
computeconfig
|
||||
computeconfig-standalone
|
||||
computeconfig-subfunction
|
||||
worker-utils
|
||||
workerconfig
|
||||
workerconfig-standalone
|
||||
workerconfig-subfunction
|
||||
configvalidator
|
||||
controllerconfig
|
||||
createrepo
|
||||
@ -276,7 +276,7 @@ nfv-tools
|
||||
vm-topology
|
||||
remote-clients
|
||||
python-networking-odl
|
||||
config-gate-compute
|
||||
config-gate-worker
|
||||
tis-extensions-controller
|
||||
wrs-heat-templates
|
||||
python-django-horizon
|
||||
|
@ -20,7 +20,7 @@ cinder-api
|
||||
cinder-scheduler
|
||||
cinder-tests
|
||||
cinder-volume
|
||||
computeconfig-subfunction
|
||||
workerconfig-subfunction
|
||||
configvalidator
|
||||
controllerconfig
|
||||
corosync
|
@ -20,7 +20,7 @@ cinder-api
|
||||
cinder-scheduler
|
||||
cinder-tests
|
||||
cinder-volume
|
||||
computeconfig-subfunction
|
||||
workerconfig-subfunction
|
||||
configvalidator
|
||||
controllerconfig
|
||||
corosync
|
@ -24,7 +24,7 @@ fi
|
||||
|
||||
# If this is an all-in-one system, we need at least 4 CPUs
|
||||
if [ "$system_type" = "All-in-one" -a ${n_cpus} -lt 4 ]; then
|
||||
report_post_failure_with_msg "ERROR: At least 4 CPUs are required for controller+compute node."
|
||||
report_post_failure_with_msg "ERROR: At least 4 CPUs are required for controller+worker node."
|
||||
fi
|
||||
|
||||
# Add kernel options for cpu isolation / affinity
|
@ -6,7 +6,7 @@
|
||||
# uncomment the global_filter line in lvm.conf
|
||||
perl -0777 -i.bak -pe 's:(# This configuration option has an automatic default value\.\n)\t# global_filter:$1 global_filter:m' /etc/lvm/lvm.conf
|
||||
|
||||
# Edit the LVM config so LVM does not look for LVs (we have none on compute nodes)
|
||||
# Edit the LVM config so LVM does not look for LVs (we have none on worker nodes)
|
||||
sed -i "s#^\( *\)global_filter = \[.*#\1global_filter = [ \"r|.*|\" ]#" /etc/lvm/lvm.conf
|
||||
%end
|
||||
|
||||
|
@ -13,7 +13,7 @@ fi
|
||||
mkdir -p -m 0775 /etc/platform
|
||||
cat <<EOF > /etc/platform/platform.conf
|
||||
nodetype=controller
|
||||
subfunction=controller,compute
|
||||
subfunction=controller,worker
|
||||
system_type=All-in-one
|
||||
security_profile=$secprofile
|
||||
EOF
|
||||
|
@ -13,7 +13,7 @@ fi
|
||||
mkdir -p -m 0775 /etc/platform
|
||||
cat <<EOF > /etc/platform/platform.conf
|
||||
nodetype=controller
|
||||
subfunction=controller,compute,lowlatency
|
||||
subfunction=controller,worker,lowlatency
|
||||
system_type=All-in-one
|
||||
security_profile=$secprofile
|
||||
EOF
|
||||
|
@ -19,8 +19,8 @@ fi
|
||||
|
||||
mkdir -p -m 0775 /etc/platform
|
||||
cat <<EOF > /etc/platform/platform.conf
|
||||
nodetype=compute
|
||||
subfunction=compute
|
||||
nodetype=worker
|
||||
subfunction=worker
|
||||
system_type=Standard
|
||||
security_profile=$secprofile
|
||||
INSTALL_UUID=$INSTALL_UUID
|
@ -19,8 +19,8 @@ fi
|
||||
|
||||
mkdir -p -m 0775 /etc/platform
|
||||
cat <<EOF > /etc/platform/platform.conf
|
||||
nodetype=compute
|
||||
subfunction=compute,lowlatency
|
||||
nodetype=worker
|
||||
subfunction=worker,lowlatency
|
||||
system_type=Standard
|
||||
security_profile=$secprofile
|
||||
INSTALL_UUID=$INSTALL_UUID
|
@ -25,11 +25,11 @@ elif [ ${RESERVEDMEM} -gt 8192 ]; then
|
||||
RESERVEDMEM=8192
|
||||
fi
|
||||
|
||||
sed -i -e "s#\(COMPUTE_BASE_RESERVED\)=.*#\1=(\"node0:${RESERVEDMEM}MB:1\" \"node1:2000MB:0\" \"node2:2000MB:0\" \"node3:2000MB:0\")#g" /etc/nova/compute_reserved.conf
|
||||
sed -i -e "s#\(WORKER_BASE_RESERVED\)=.*#\1=(\"node0:${RESERVEDMEM}MB:1\" \"node1:2000MB:0\" \"node2:2000MB:0\" \"node3:2000MB:0\")#g" /etc/platform/worker_reserved.conf
|
||||
|
||||
# Update COMPUTE_CPU_LIST
|
||||
# Update WORKER_CPU_LIST
|
||||
N_CPUS=$(cat /proc/cpuinfo 2>/dev/null | awk '/^[pP]rocessor/ { n +=1 } END { print (n>0) ? n : 1}')
|
||||
sed -i "s/^COMPUTE_CPU_LIST=.*/COMPUTE_CPU_LIST=\"0-$((N_CPUS-1))\"/" /etc/nova/compute_reserved.conf
|
||||
sed -i "s/^WORKER_CPU_LIST=.*/WORKER_CPU_LIST=\"0-$((N_CPUS-1))\"/" /etc/platform/worker_reserved.conf
|
||||
|
||||
%end
|
||||
|
||||
|
@ -119,20 +119,20 @@ def main():
|
||||
|
||||
add_group(comps, 'controller', rpmlist,
|
||||
filter_dir, 'filter_out_from_controller')
|
||||
add_group(comps, 'controller-compute', rpmlist,
|
||||
add_group(comps, 'controller-worker', rpmlist,
|
||||
filter_dir, 'filter_out_from_smallsystem')
|
||||
add_group(comps, 'controller-compute-lowlatency', rpmlist,
|
||||
add_group(comps, 'controller-worker-lowlatency', rpmlist,
|
||||
filter_dir, 'filter_out_from_smallsystem_lowlatency')
|
||||
add_group(comps, 'compute', rpmlist, filter_dir, 'filter_out_from_compute')
|
||||
add_group(comps, 'compute-lowlatency', rpmlist,
|
||||
filter_dir, 'filter_out_from_compute_lowlatency')
|
||||
add_group(comps, 'worker', rpmlist, filter_dir, 'filter_out_from_worker')
|
||||
add_group(comps, 'worker-lowlatency', rpmlist,
|
||||
filter_dir, 'filter_out_from_worker_lowlatency')
|
||||
add_group(comps, 'storage', rpmlist, filter_dir, 'filter_out_from_storage')
|
||||
|
||||
add_group(comps, 'controller')
|
||||
add_group(comps, 'controller-compute')
|
||||
add_group(comps, 'controller-compute-lowlatency')
|
||||
add_group(comps, 'compute')
|
||||
add_group(comps, 'compute-lowlatency')
|
||||
add_group(comps, 'controller-worker')
|
||||
add_group(comps, 'controller-worker-lowlatency')
|
||||
add_group(comps, 'worker')
|
||||
add_group(comps, 'worker-lowlatency')
|
||||
add_group(comps, 'storage')
|
||||
|
||||
tree.write(groups_file, encoding="UTF-8")
|
||||
|
@ -23,19 +23,19 @@ Source013: post_clone_iso_ks.cfg
|
||||
Source030: default
|
||||
Source031: default.static
|
||||
Source032: centos-pxe-controller-install
|
||||
Source033: centos-pxe-compute-install
|
||||
Source033: centos-pxe-worker-install
|
||||
Source034: centos-pxe-smallsystem-install
|
||||
Source035: centos-pxe-storage-install
|
||||
Source036: centos-pxe-compute_lowlatency-install
|
||||
Source036: centos-pxe-worker_lowlatency-install
|
||||
Source037: centos-pxe-smallsystem_lowlatency-install
|
||||
|
||||
Source050: pxe-grub.cfg
|
||||
Source051: pxe-grub.cfg.static
|
||||
Source052: efi-centos-pxe-controller-install
|
||||
Source053: efi-centos-pxe-compute-install
|
||||
Source053: efi-centos-pxe-worker-install
|
||||
Source054: efi-centos-pxe-smallsystem-install
|
||||
Source055: efi-centos-pxe-storage-install
|
||||
Source056: efi-centos-pxe-compute_lowlatency-install
|
||||
Source056: efi-centos-pxe-worker_lowlatency-install
|
||||
Source057: efi-centos-pxe-smallsystem_lowlatency-install
|
||||
|
||||
|
||||
@ -75,21 +75,21 @@ install -v -m 755 %{_sourcedir}/pxeboot-update.sh %{buildroot}%{_sbindir}/pxeboo
|
||||
|
||||
install -v -m 644 %{_sourcedir}/post_clone_iso_ks.cfg \
|
||||
%{buildroot}/pxeboot/post_clone_iso_ks.cfg
|
||||
|
||||
|
||||
install -v -m 644 %{_sourcedir}/default \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/default
|
||||
install -v -m 644 %{_sourcedir}/default.static \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/default.static
|
||||
install -v -m 644 %{_sourcedir}/centos-pxe-controller-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/pxe-controller-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/centos-pxe-compute-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/pxe-compute-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/centos-pxe-worker-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/pxe-worker-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/centos-pxe-smallsystem-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/pxe-smallsystem-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/centos-pxe-storage-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/pxe-storage-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/centos-pxe-compute_lowlatency-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/pxe-compute_lowlatency-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/centos-pxe-worker_lowlatency-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/pxe-worker_lowlatency-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/centos-pxe-smallsystem_lowlatency-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/pxe-smallsystem_lowlatency-install-%{platform_release}
|
||||
|
||||
@ -104,14 +104,14 @@ install -v -m 644 %{_sourcedir}/efiboot.img \
|
||||
%{buildroot}/pxeboot/rel-%{platform_release}/
|
||||
install -v -m 644 %{_sourcedir}/efi-centos-pxe-controller-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/efi-pxe-controller-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/efi-centos-pxe-compute-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/efi-pxe-compute-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/efi-centos-pxe-worker-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/efi-pxe-worker-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/efi-centos-pxe-smallsystem-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/efi-centos-pxe-storage-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/efi-pxe-storage-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/efi-centos-pxe-compute_lowlatency-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/efi-pxe-compute_lowlatency-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/efi-centos-pxe-worker_lowlatency-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/efi-pxe-worker_lowlatency-install-%{platform_release}
|
||||
install -v -m 644 %{_sourcedir}/efi-centos-pxe-smallsystem_lowlatency-install \
|
||||
%{buildroot}/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem_lowlatency-install-%{platform_release}
|
||||
|
||||
|
@ -19,9 +19,9 @@ NOCOMPLETE 1
|
||||
ALLOWOPTIONS 0
|
||||
|
||||
LABEL 1
|
||||
MENU LABEL ^1) Compute
|
||||
MENU LABEL ^1) Worker
|
||||
MENU DEFAULT
|
||||
KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
|
||||
APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_compute_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
|
||||
APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
|
||||
IPAPPEND 2
|
||||
|
@ -19,9 +19,9 @@ NOCOMPLETE 1
|
||||
ALLOWOPTIONS 0
|
||||
|
||||
LABEL 1
|
||||
MENU LABEL ^1) Lowlatency Compute
|
||||
MENU LABEL ^1) Lowlatency Worker
|
||||
MENU DEFAULT
|
||||
KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
|
||||
APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_compute_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
|
||||
APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
|
||||
IPAPPEND 2
|
||||
|
@ -3,7 +3,7 @@ timeout=10
|
||||
GRUB_HIDDEN_TIMEOUT=0
|
||||
GRUB_TIMEOUT_STYLE='countdown'
|
||||
|
||||
menuentry '1) UEFI Compute' {
|
||||
linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_compute_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
|
||||
menuentry '1) UEFI Worker' {
|
||||
linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
|
||||
initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
|
||||
}
|
@ -3,7 +3,7 @@ timeout=10
|
||||
GRUB_HIDDEN_TIMEOUT=0
|
||||
GRUB_TIMEOUT_STYLE='countdown'
|
||||
|
||||
menuentry '1) UEFI Lowlatency Compute' {
|
||||
linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_compute_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
|
||||
menuentry '1) UEFI Lowlatency Worker' {
|
||||
linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
|
||||
initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
|
||||
}
|
@ -34,7 +34,7 @@ const char mtc_msg_rep_msg_header [MSG_HEADER_SIZE] = {"cgts mtc rep msg:"};
|
||||
const char mtc_log_msg_hdr [MSG_HEADER_SIZE] = {"cgts mtc log msg:"};
|
||||
|
||||
/** Maintenance Message header content */
|
||||
const char mtc_compute_msg_header [MSG_HEADER_SIZE] = {"cgts mtc message:"};
|
||||
const char mtc_worker_msg_header [MSG_HEADER_SIZE] = {"cgts mtc message:"};
|
||||
|
||||
const char mtc_event_hdr [MSG_HEADER_SIZE] = {"mtce event msg :"};
|
||||
|
||||
@ -50,7 +50,7 @@ const char * get_loopback_header (void) { return mtc_loopback_hdr;}
|
||||
const char * get_hbs_cmd_req_header (void) { return mtc_hbs_cmd_req_header ;}
|
||||
const char * get_cmd_req_msg_header (void) { return mtc_cmd_req_msg_header ;}
|
||||
const char * get_cmd_rsp_msg_header (void) { return mtc_cmd_rsp_msg_header ;}
|
||||
const char * get_compute_msg_header (void) { return mtc_compute_msg_header ;}
|
||||
const char * get_worker_msg_header (void) { return mtc_worker_msg_header ;}
|
||||
const char * get_pmond_pulse_header (void) { return mtc_pmond_pulse_header ;}
|
||||
const char * get_mtc_log_msg_hdr (void) { return mtc_log_msg_hdr ;}
|
||||
const char * get_mtce_event_header (void) { return mtc_event_hdr ;}
|
||||
@ -160,10 +160,10 @@ const char * get_mtcNodeCommand_str ( int cmd )
|
||||
|
||||
/* start and stop services commands and messages */
|
||||
case MTC_CMD_STOP_CONTROL_SVCS: return ("stop controller host services");
|
||||
case MTC_CMD_STOP_COMPUTE_SVCS: return ("stop compute host services");
|
||||
case MTC_CMD_STOP_WORKER_SVCS: return ("stop worker host services");
|
||||
case MTC_CMD_STOP_STORAGE_SVCS: return ("stop storage host services");
|
||||
case MTC_CMD_START_CONTROL_SVCS: return ("start controller host services");
|
||||
case MTC_CMD_START_COMPUTE_SVCS: return ("start compute host services");
|
||||
case MTC_CMD_START_WORKER_SVCS: return ("start worker host services");
|
||||
case MTC_CMD_START_STORAGE_SVCS: return ("start storage host services");
|
||||
case MTC_CMD_HOST_SVCS_RESULT: return ("host services result");
|
||||
|
||||
@ -721,10 +721,10 @@ void recovery_ctrl_init ( recovery_ctrl_type & recovery_ctrl )
|
||||
bool is_host_services_cmd ( unsigned int cmd )
|
||||
{
|
||||
if (( cmd == MTC_CMD_START_CONTROL_SVCS ) ||
|
||||
( cmd == MTC_CMD_START_COMPUTE_SVCS ) ||
|
||||
( cmd == MTC_CMD_START_WORKER_SVCS ) ||
|
||||
( cmd == MTC_CMD_START_STORAGE_SVCS ) ||
|
||||
( cmd == MTC_CMD_STOP_CONTROL_SVCS ) ||
|
||||
( cmd == MTC_CMD_STOP_COMPUTE_SVCS ) ||
|
||||
( cmd == MTC_CMD_STOP_WORKER_SVCS ) ||
|
||||
( cmd == MTC_CMD_STOP_STORAGE_SVCS ) ||
|
||||
( cmd == MTC_CMD_HOST_SVCS_RESULT ))
|
||||
{
|
||||
|
@ -117,7 +117,7 @@ void daemon_exit ( void );
|
||||
|
||||
|
||||
#define GOENABLED_DIR ((const char *)"/etc/goenabled.d") /* generic */
|
||||
#define GOENABLED_COMPUTE_DIR ((const char *)"/etc/goenabled.d/compute")
|
||||
#define GOENABLED_WORKER_DIR ((const char *)"/etc/goenabled.d/worker")
|
||||
#define GOENABLED_STORAGE_DIR ((const char *)"/etc/goenabled.d/storage")
|
||||
#define GOENABLED_CONTROL_DIR ((const char *)"/etc/goenabled.d/control")
|
||||
|
||||
@ -130,11 +130,11 @@ void daemon_exit ( void );
|
||||
#define GOENABLED_SUBF_FAIL ((const char *)"/var/run/goenabled_subf_failed")
|
||||
|
||||
#define CONFIG_COMPLETE_CONTROL ((const char *)"/var/run/.controller_config_complete")
|
||||
#define CONFIG_COMPLETE_COMPUTE ((const char *)"/var/run/.compute_config_complete")
|
||||
#define CONFIG_COMPLETE_WORKER ((const char *)"/var/run/.worker_config_complete")
|
||||
#define CONFIG_COMPLETE_STORAGE ((const char *)"/var/run/.storage_config_complete")
|
||||
#define CONFIG_COMPLETE_FILE ((const char *)"/etc/platform/.initial_config_complete")
|
||||
|
||||
#define DISABLE_COMPUTE_SERVICES ((const char *)"/var/run/.disable_compute_services")
|
||||
#define DISABLE_WORKER_SERVICES ((const char *)"/var/run/.disable_worker_services")
|
||||
|
||||
#define PATCHING_IN_PROG_FILE ((const char *)"/var/run/patch_installing")
|
||||
#define NODE_IS_PATCHED_FILE ((const char *)"/var/run/node_is_patched")
|
||||
@ -244,13 +244,13 @@ void daemon_exit ( void );
|
||||
#define MTC_TASK_MAIN_SERVICE_FAIL "Start Services Failed, re-enabling"
|
||||
#define MTC_TASK_MAIN_SERVICE_TO "Start Services Timeout, re-enabling"
|
||||
|
||||
#define MTC_TASK_ENABLING_SUBF "Enabling Compute Service"
|
||||
#define MTC_TASK_SUBF_CONFIG_FAIL "Compute Configuration Failed, re-enabling"
|
||||
#define MTC_TASK_SUBF_CONFIG_TO "Compute Configuration Timeout, re-enabling"
|
||||
#define MTC_TASK_SUBF_INTEST_FAIL "Compute In-Test Failed, re-enabling"
|
||||
#define MTC_TASK_SUBF_INTEST_TO "Compute In-Test Timeout, re-enabling"
|
||||
#define MTC_TASK_SUBF_SERVICE_FAIL "Compute Start Services Failed, re-enabling"
|
||||
#define MTC_TASK_SUBF_SERVICE_TO "Compute Start Services Timeout, re-enabling"
|
||||
#define MTC_TASK_ENABLING_SUBF "Enabling Worker Service"
|
||||
#define MTC_TASK_SUBF_CONFIG_FAIL "Worker Configuration Failed, re-enabling"
|
||||
#define MTC_TASK_SUBF_CONFIG_TO "Worker Configuration Timeout, re-enabling"
|
||||
#define MTC_TASK_SUBF_INTEST_FAIL "Worker In-Test Failed, re-enabling"
|
||||
#define MTC_TASK_SUBF_INTEST_TO "Worker In-Test Timeout, re-enabling"
|
||||
#define MTC_TASK_SUBF_SERVICE_FAIL "Worker Start Services Failed, re-enabling"
|
||||
#define MTC_TASK_SUBF_SERVICE_TO "Worker Start Services Timeout, re-enabling"
|
||||
|
||||
#define MTC_TASK_AR_DISABLED_CONFIG "Configuration failure, threshold reached, Lock/Unlock to retry"
|
||||
#define MTC_TASK_AR_DISABLED_GOENABLE "In-Test Failure, threshold reached, Lock/Unlock to retry"
|
||||
@ -295,8 +295,8 @@ void daemon_exit ( void );
|
||||
/* number of calls to the bm_handler while bm_access is not confirmed */
|
||||
#define MTC_MAX_B2B_BM_ACCESS_FAIL_COUNT_B4_ALARM (5)
|
||||
/* string too long for inv */
|
||||
#define MTC_TASK_DISABLE_REJ "Lock Rejected: Incomplete Migration" /* Please Enable More Compute Resources" */
|
||||
#define MTC_TASK_DISABLE_NOHOST "Lock Rejected: Please Enable More Compute Resources"
|
||||
#define MTC_TASK_DISABLE_REJ "Lock Rejected: Incomplete Migration" /* Please Enable More Worker Resources" */
|
||||
#define MTC_TASK_DISABLE_NOHOST "Lock Rejected: Please Enable More Worker Resources"
|
||||
#define MTC_TASK_MIGRATE_FAIL "Lock Failed: Undetermined Reason"
|
||||
#define MTC_TASK_DISABLE_NOHOSTS "Insufficient Enabled Resources for Live Migration"
|
||||
#define MTC_TASK_DISABLE_FORCE "Force Lock Reset in Progress"
|
||||
@ -386,7 +386,7 @@ void daemon_exit ( void );
|
||||
#define CGTS_NODE_TYPE_SIZE 12
|
||||
#define CGTS_NODE_NULL (0x00)
|
||||
#define CONTROLLER_TYPE (0x01)
|
||||
#define COMPUTE_TYPE (0x02)
|
||||
#define WORKER_TYPE (0x02)
|
||||
#define STORAGE_TYPE (0x04)
|
||||
#define CGCS_STORAGE_NFS 0
|
||||
#define CGCS_STORAGE_CEPH 1
|
||||
@ -460,7 +460,7 @@ const char * get_hbs_cmd_req_header ( void ) ;
|
||||
const char * get_cmd_req_msg_header ( void ) ;
|
||||
const char * get_cmd_rsp_msg_header ( void ) ;
|
||||
const char * get_msg_rep_msg_header ( void ) ;
|
||||
const char * get_compute_msg_header ( void ) ;
|
||||
const char * get_worker_msg_header ( void ) ;
|
||||
const char * get_mtc_log_msg_hdr ( void ) ;
|
||||
const char * get_pmond_pulse_header ( void ) ;
|
||||
const char * get_mtce_event_header ( void ) ;
|
||||
@ -706,10 +706,10 @@ typedef struct
|
||||
#define MTC_MSG_SUBF_GOENABLED_FAILED 12 /* from host */
|
||||
#define MTC_MSG_LOCKED 13 /* to host */
|
||||
#define MTC_CMD_STOP_CONTROL_SVCS 14 /* to host */
|
||||
#define MTC_CMD_STOP_COMPUTE_SVCS 15 /* to host */
|
||||
#define MTC_CMD_STOP_WORKER_SVCS 15 /* to host */
|
||||
#define MTC_CMD_STOP_STORAGE_SVCS 16 /* to host */
|
||||
#define MTC_CMD_START_CONTROL_SVCS 17 /* to host */
|
||||
#define MTC_CMD_START_COMPUTE_SVCS 18 /* to host */
|
||||
#define MTC_CMD_START_WORKER_SVCS 18 /* to host */
|
||||
#define MTC_CMD_START_STORAGE_SVCS 19 /* to host */
|
||||
#define MTC_CMD_LAZY_REBOOT 20 /* to host */
|
||||
#define MTC_CMD_HOST_SVCS_RESULT 21 /* to host */
|
||||
|
@ -70,7 +70,7 @@
|
||||
#define MTC_BM_POWERON_TIMEOUT (30)
|
||||
#define MTC_RESET_PROG_TIMEOUT (20)
|
||||
#define MTC_WORKQUEUE_TIMEOUT (60)
|
||||
#define MTC_COMPUTE_CONFIG_TIMEOUT (900)
|
||||
#define MTC_WORKER_CONFIG_TIMEOUT (900)
|
||||
#define MTC_EXIT_DOR_MODE_TIMEOUT (60*15)
|
||||
#define MTC_RESET_PROG_OFFLINE_TIMEOUT (20)
|
||||
#define MTC_RESET_TO_OFFLINE_TIMEOUT (150)
|
||||
|
@ -156,8 +156,8 @@ void print_inv ( node_inv_type & info )
|
||||
unsigned int get_host_function_mask ( string & nodeType_str )
|
||||
{
|
||||
unsigned int nodeType = CGTS_NODE_NULL ;
|
||||
if ( nodeType_str.find("compute") != string::npos )
|
||||
nodeType |= COMPUTE_TYPE ;
|
||||
if ( nodeType_str.find("worker") != string::npos )
|
||||
nodeType |= WORKER_TYPE ;
|
||||
if ( nodeType_str.find("controller") != string::npos )
|
||||
nodeType |= CONTROLLER_TYPE ;
|
||||
if ( nodeType_str.find("storage") != string::npos )
|
||||
@ -170,7 +170,7 @@ bool is_combo_system (unsigned int nodetype_mask )
|
||||
{
|
||||
if ( nodetype_mask & CONTROLLER_TYPE )
|
||||
{
|
||||
if ( nodetype_mask & COMPUTE_TYPE )
|
||||
if ( nodetype_mask & WORKER_TYPE )
|
||||
{
|
||||
return (true);
|
||||
}
|
||||
@ -200,10 +200,10 @@ int set_host_functions ( string nodetype_str,
|
||||
dlog2 ("Function : controller\n");
|
||||
|
||||
/* Check for subfunctions */
|
||||
if ( *nodetype_bits_ptr & COMPUTE_TYPE )
|
||||
if ( *nodetype_bits_ptr & WORKER_TYPE )
|
||||
{
|
||||
dlog2 ("Sub Function: compute\n");
|
||||
*nodetype_subfunction_ptr = COMPUTE_TYPE ;
|
||||
dlog2 ("Sub Function: worker\n");
|
||||
*nodetype_subfunction_ptr = WORKER_TYPE ;
|
||||
}
|
||||
if ( *nodetype_bits_ptr & STORAGE_TYPE )
|
||||
{
|
||||
@ -213,10 +213,10 @@ int set_host_functions ( string nodetype_str,
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( *nodetype_bits_ptr & COMPUTE_TYPE )
|
||||
if ( *nodetype_bits_ptr & WORKER_TYPE )
|
||||
{
|
||||
*nodetype_function_ptr = COMPUTE_TYPE ;
|
||||
dlog2 ("Function : compute\n");
|
||||
*nodetype_function_ptr = WORKER_TYPE ;
|
||||
dlog2 ("Function : worker\n");
|
||||
}
|
||||
else if ( *nodetype_bits_ptr & STORAGE_TYPE )
|
||||
{
|
||||
|
@ -107,10 +107,10 @@ int timeout_config_handler ( void * user,
|
||||
config_ptr->controller_mtcalive_timeout,
|
||||
extended ? "(doubled for vbox)" : "");
|
||||
}
|
||||
else if (MATCH("timeouts", "compute_boot_timeout"))
|
||||
else if (MATCH("timeouts", "worker_boot_timeout"))
|
||||
{
|
||||
config_ptr->compute_mtcalive_timeout = atoi(value);
|
||||
ilog (" mtcAlive TO: %4d secs (compute)\n" , config_ptr->compute_mtcalive_timeout);
|
||||
ilog (" mtcAlive TO: %4d secs (worker)\n" , config_ptr->compute_mtcalive_timeout);
|
||||
}
|
||||
else if (MATCH("timeouts", "goenabled_timeout"))
|
||||
{
|
||||
|
@ -34,14 +34,14 @@ Maintenance support files for compute-only node type
|
||||
make install buildroot=%{buildroot} _sysconfdir=%{_sysconfdir} _unitdir=%{_unitdir} _datarootdir=%{_datarootdir}
|
||||
|
||||
%post
|
||||
/bin/systemctl enable goenabled-compute.service
|
||||
/bin/systemctl enable goenabled-worker.service
|
||||
/bin/systemctl enable e_nova-init.service
|
||||
/bin/systemctl enable qemu_clean.service
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
%{_sysconfdir}/init.d/goenabledCompute
|
||||
%{_sysconfdir}/init.d/goenabledWorker
|
||||
%{_sysconfdir}/init.d/e_nova-init
|
||||
%{_sysconfdir}/init.d/nova-cleanup
|
||||
%{_sysconfdir}/init.d/nova-startup
|
||||
@ -50,7 +50,7 @@ make install buildroot=%{buildroot} _sysconfdir=%{_sysconfdir} _unitdir=%{_unitd
|
||||
%{local_etc_pmond}/libvirtd.conf
|
||||
%{local_etc_goenabledd}/nova-goenabled.sh
|
||||
%{local_etc_goenabledd}/virt-support-goenabled.sh
|
||||
%{_unitdir}/goenabled-compute.service
|
||||
%{_unitdir}/goenabled-worker.service
|
||||
%{_unitdir}/e_nova-init.service
|
||||
|
||||
%license %{_datarootdir}/licenses/mtce-compute-1.0/LICENSE
|
||||
|
@ -11,7 +11,7 @@ SOURCE14 = libvirtd.conf
|
||||
SOURCE21 = nova-goenabled.sh
|
||||
SOURCE22 = virt-support-goenabled.sh
|
||||
|
||||
SOURCE31 = goenabled-compute.service
|
||||
SOURCE31 = goenabled-worker.service
|
||||
SOURCE32 = e_nova-init.service
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ local_etc_nova = $(_sysconfdir)/nova
|
||||
install:
|
||||
# nfv-plugins
|
||||
# # Compute-Only Init Scripts (source group x)
|
||||
install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledCompute
|
||||
install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledWorker
|
||||
install -m 755 -p -D scripts/$(SOURCE2) $(buildroot)/$(_sysconfdir)/init.d/e_nova-init
|
||||
install -m 755 -p -D scripts/$(SOURCE3) $(buildroot)/$(_sysconfdir)/init.d/nova-cleanup
|
||||
install -m 755 -p -D scripts/$(SOURCE4) $(buildroot)/$(_sysconfdir)/init.d/nova-startup
|
||||
@ -39,7 +39,7 @@ install:
|
||||
install -m 755 -p -D scripts/$(SOURCE21) $(buildroot)/$(local_etc_goenabledd)/nova-goenabled.sh
|
||||
install -m 755 -p -D scripts/$(SOURCE22) $(buildroot)/$(local_etc_goenabledd)/virt-support-goenabled.sh
|
||||
# Install to systemd (source group 3x)
|
||||
install -m 644 -p -D scripts/$(SOURCE31) $(buildroot)/$(_unitdir)/goenabled-compute.service
|
||||
install -m 644 -p -D scripts/$(SOURCE31) $(buildroot)/$(_unitdir)/goenabled-worker.service
|
||||
install -m 644 -p -D scripts/$(SOURCE32) $(buildroot)/$(_unitdir)/e_nova-init.service
|
||||
# for license
|
||||
install -m 755 -d $(buildroot)/$(_datarootdir)/licenses/mtce-compute-1.0
|
||||
|
@ -75,16 +75,16 @@ case "$1" in
|
||||
|
||||
# Do not continue if the host has not been configured. We don't
|
||||
# want to run nova-compute before its config file has been updated.
|
||||
if [ ! -f ${INITIAL_COMPUTE_CONFIG_COMPLETE} ]
|
||||
if [ ! -f ${INITIAL_WORKER_CONFIG_COMPLETE} ]
|
||||
then
|
||||
log "Initial compute configuration is not complete"
|
||||
log "Initial worker configuration is not complete"
|
||||
exit ${GENERIC_ERROR}
|
||||
fi
|
||||
|
||||
# Do not continue if the compute services are disabled.
|
||||
if [ -f ${VOLATILE_DISABLE_COMPUTE_SERVICES} ]
|
||||
# Do not continue if the worker services are disabled.
|
||||
if [ -f ${VOLATILE_DISABLE_WORKER_SERVICES} ]
|
||||
then
|
||||
log "Compute services are disabled, nothing to do"
|
||||
log "Worker services are disabled, nothing to do"
|
||||
rm ${NOVA_INIT_FAILED}
|
||||
exit ${SUCCESS}
|
||||
fi
|
||||
|
@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Titanium Cloud Nova Init
|
||||
After=network.target config.service compute-config-gate.service
|
||||
Before=goenabled-compute.service
|
||||
After=network.target config.service worker-config-gate.service
|
||||
Before=goenabled-worker.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
@ -154,9 +154,9 @@ function status()
|
||||
# Main Entry
|
||||
################################################################################
|
||||
|
||||
# Don't run this till compute is configured
|
||||
if [ ! -e $VOLATILE_COMPUTE_CONFIG_COMPLETE ] ; then
|
||||
logger "Compute is not configured"
|
||||
# Don't run this till worker is configured
|
||||
if [ ! -e $VOLATILE_WORKER_CONFIG_COMPLETE ] ; then
|
||||
logger "Worker is not configured"
|
||||
exit $RETVAL
|
||||
fi
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
[Unit]
|
||||
Description=Titanium Cloud Maintenance Compute Goenable Ready
|
||||
After=config.service compute-config-gate.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/etc/init.d/goenabledCompute start
|
||||
ExecStop=/etc/init.d/goenabledCompute stop
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
12
mtce-compute/src/scripts/goenabled-worker.service
Normal file
12
mtce-compute/src/scripts/goenabled-worker.service
Normal file
@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=Titanium Cloud Maintenance Worker Goenable Ready
|
||||
After=config.service worker-config-gate.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/etc/init.d/goenabledWorker start
|
||||
ExecStop=/etc/init.d/goenabledWorker stop
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
@ -13,13 +13,13 @@ debounce = 20 ; number of seconds that a process needs to remain
|
||||
startuptime = 5 ; Seconds to wait after process start before starting the debounce monitor
|
||||
mode = passive ; Monitoring mode: passive (default) or active
|
||||
; passive: process death monitoring (default: always)
|
||||
; active : heartbeat monitoring, i.e. request / response messaging
|
||||
; active : heartbeat monitoring, i.e. request / response messaging
|
||||
; ignore : do not monitor or stop monitoring
|
||||
subfunction = compute ; Optional label.
|
||||
; Manage this process in the context of a combo host subfunction
|
||||
; Choices: compute or storage.
|
||||
subfunction = worker ; Optional label.
|
||||
; Manage this process in the context of a combo host subfunction
|
||||
; Choices: worker or storage.
|
||||
; when specified pmond will wait for
|
||||
; /var/run/.compute_config_complete or
|
||||
; /var/run/.storage_config_complete
|
||||
; /var/run/.worker_config_complete or
|
||||
; /var/run/.storage_config_complete
|
||||
; ... before managing this process with the specified subfunction
|
||||
; Excluding this label will cause this process to be managed by default on startup
|
||||
|
@ -13,13 +13,13 @@ debounce = 360 ; number of seconds that a process needs to remain
|
||||
startuptime = 15 ; Seconds to wait after process start before starting the debounce monitor
|
||||
mode = passive ; Monitoring mode: passive (default) or active
|
||||
; passive: process death monitoring (default: always)
|
||||
; active : heartbeat monitoring, i.e. request / response messaging
|
||||
; active : heartbeat monitoring, i.e. request / response messaging
|
||||
; ignore : do not monitor or stop monitoring
|
||||
subfunction = compute ; Optional label.
|
||||
; Manage this process in the context of a combo host subfunction
|
||||
; Choices: compute or storage.
|
||||
subfunction = worker ; Optional label.
|
||||
; Manage this process in the context of a combo host subfunction
|
||||
; Choices: worker or storage.
|
||||
; when specified pmond will wait for
|
||||
; /var/run/.compute_config_complete or
|
||||
; /var/run/.storage_config_complete
|
||||
; /var/run/.worker_config_complete or
|
||||
; /var/run/.storage_config_complete
|
||||
; ... before managing this process with the specified subfunction
|
||||
; Excluding this label will cause this process to be managed by default on startup
|
||||
|
@ -13,13 +13,13 @@ debounce = 20 ; number of seconds that a process needs to remain
|
||||
startuptime = 15 ; Seconds to wait after process start before starting the debounce monitor
|
||||
mode = passive ; Monitoring mode: passive (default) or active
|
||||
; passive: process death monitoring (default: always)
|
||||
; active : heartbeat monitoring, i.e. request / response messaging
|
||||
; active : heartbeat monitoring, i.e. request / response messaging
|
||||
; ignore : do not monitor or stop monitoring
|
||||
subfunction = compute ; Optional label.
|
||||
; Manage this process in the context of a combo host subfunction
|
||||
; Choices: compute or storage.
|
||||
subfunction = worker ; Optional label.
|
||||
; Manage this process in the context of a combo host subfunction
|
||||
; Choices: worker or storage.
|
||||
; when specified pmond will wait for
|
||||
; /var/run/.compute_config_complete or
|
||||
; /var/run/.storage_config_complete
|
||||
; /var/run/.worker_config_complete or
|
||||
; /var/run/.storage_config_complete
|
||||
; ... before managing this process with the specified subfunction
|
||||
; Excluding this label will cause this process to be managed by default on startup
|
||||
|
@ -32,7 +32,7 @@ NOVA_ADVANCE_ENABLED="/var/run/.nova_timer_advance_enabled"
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
if [ -e ${VOLATILE_COMPUTE_CONFIG_COMPLETE} ] && [ ! -e ${VOLATILE_DISABLE_COMPUTE_SERVICES} ]; then
|
||||
if [ -e ${VOLATILE_WORKER_CONFIG_COMPLETE} ] && [ ! -e ${VOLATILE_DISABLE_WORKER_SERVICES} ]; then
|
||||
log "Start"
|
||||
|
||||
if [ -e ${NOVA_INIT_FAILED} ]; then
|
||||
|
@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Titanium Cloud Nova Init
|
||||
After=network.target config.service
|
||||
Before=goenabled-compute.service
|
||||
Before=goenabled-worker.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
@ -259,7 +259,7 @@ hardware failure detection, reporting and recovery. The Resource Monitor
|
||||
Service (rmond) adds resource monitoring with present and predictive
|
||||
failure and overload detection and reporting. The Guest Services
|
||||
(guestAgent/guestServer) daemons control access into and heartbeat of guest
|
||||
VMs on the compute. The Host Watchdog (hostwd) daemon watches for errors in
|
||||
VMs on the worker. The Host Watchdog (hostwd) daemon watches for errors in
|
||||
pmond and logs system information on error. All of these maintenance
|
||||
services improve MTTD of node failures as well as resource overload and out
|
||||
of spec operating conditions that can reduce outage time through automated
|
||||
@ -385,9 +385,9 @@ install -m 755 -p -D %{_buildsubdir}/scripts/goenabled %{buildroot}%{_sysconfdir
|
||||
# start or stop services test script
|
||||
install -m 755 -d %{buildroot}%{local_etc_servicesd}
|
||||
install -m 755 -d %{buildroot}%{local_etc_servicesd}/controller
|
||||
install -m 755 -d %{buildroot}%{local_etc_servicesd}/compute
|
||||
install -m 755 -d %{buildroot}%{local_etc_servicesd}/worker
|
||||
install -m 755 -d %{buildroot}%{local_etc_servicesd}/storage
|
||||
install -m 755 -p -D %{_buildsubdir}/scripts/mtcTest %{buildroot}/%{local_etc_servicesd}/compute
|
||||
install -m 755 -p -D %{_buildsubdir}/scripts/mtcTest %{buildroot}/%{local_etc_servicesd}/worker
|
||||
install -m 755 -p -D %{_buildsubdir}/scripts/mtcTest %{buildroot}/%{local_etc_servicesd}/controller
|
||||
install -m 755 -p -D %{_buildsubdir}/scripts/mtcTest %{buildroot}/%{local_etc_servicesd}/storage
|
||||
install -m 755 -p -D %{_buildsubdir}/scripts/runservices %{buildroot}%{_sysconfdir}/init.d/runservices
|
||||
@ -508,7 +508,7 @@ install -m 755 -d %{buildroot}/var/run
|
||||
# Maintenance start/stop services scripts
|
||||
%{local_etc_servicesd}/controller/mtcTest
|
||||
%{local_etc_servicesd}/storage/mtcTest
|
||||
%{local_etc_servicesd}/compute/mtcTest
|
||||
%{local_etc_servicesd}/worker/mtcTest
|
||||
|
||||
# BMC profile Files
|
||||
%{bmc_profilesd}/sensor_hp360_v1_ilo_v4.profile
|
||||
|
@ -1704,7 +1704,7 @@ int nodeLinkClass::alarm_enabled_clear ( struct nodeLinkClass::node * node_ptr,
|
||||
return (PASS);
|
||||
}
|
||||
|
||||
/* Generate compute subfunction failure alarm */
|
||||
/* Generate worker subfunction failure alarm */
|
||||
int nodeLinkClass::alarm_compute_failure ( struct nodeLinkClass::node * node_ptr, EFmAlarmSeverityT sev )
|
||||
{
|
||||
if ( (node_ptr->degrade_mask & DEGRADE_MASK_SUBF) == 0 )
|
||||
@ -1716,12 +1716,12 @@ int nodeLinkClass::alarm_compute_failure ( struct nodeLinkClass::node * node_ptr
|
||||
{
|
||||
if ( sev == FM_ALARM_SEVERITY_CRITICAL )
|
||||
{
|
||||
elog ("%s critical compute subf failure\n", node_ptr->hostname.c_str());
|
||||
elog ("%s critical worker subf failure\n", node_ptr->hostname.c_str());
|
||||
mtcAlarm_critical ( node_ptr->hostname, MTC_ALARM_ID__CH_COMP );
|
||||
}
|
||||
else
|
||||
{
|
||||
elog ("%s major compute subf failure\n", node_ptr->hostname.c_str());
|
||||
elog ("%s major worker subf failure\n", node_ptr->hostname.c_str());
|
||||
mtcAlarm_major ( node_ptr->hostname, MTC_ALARM_ID__CH_COMP );
|
||||
}
|
||||
node_ptr->alarms[MTC_ALARM_ID__CH_COMP] = sev ;
|
||||
@ -1757,7 +1757,7 @@ int nodeLinkClass::alarm_insv_clear ( struct nodeLinkClass::node * node_ptr, boo
|
||||
return (PASS);
|
||||
}
|
||||
|
||||
/* Clear the compute subfunction alarm and degrade flag */
|
||||
/* Clear the worker subfunction alarm and degrade flag */
|
||||
int nodeLinkClass::alarm_compute_clear ( struct nodeLinkClass::node * node_ptr, bool force )
|
||||
{
|
||||
if ( node_ptr->degrade_mask & DEGRADE_MASK_SUBF )
|
||||
@ -3036,7 +3036,7 @@ bool nodeLinkClass::can_uuid_be_locked ( string uuid , int & reason )
|
||||
}
|
||||
/* Rule 2 - Cannot lock inactive controller if the floating storage
|
||||
* ceph monitor is locked */
|
||||
if (( get_storage_backend() == CGCS_STORAGE_CEPH ) &&
|
||||
if (( get_storage_backend() == CGCS_STORAGE_CEPH ) &&
|
||||
( is_storage_mon_enabled () == false ))
|
||||
{
|
||||
wlog ("%s cannot be 'locked' - failed storage redundancy check\n", node_ptr->hostname.c_str());
|
||||
@ -3046,7 +3046,7 @@ bool nodeLinkClass::can_uuid_be_locked ( string uuid , int & reason )
|
||||
ilog ("%s can be locked\n", node_ptr->hostname.c_str());
|
||||
return (true);
|
||||
}
|
||||
else if ( is_compute(node_ptr) )
|
||||
else if ( is_worker(node_ptr) )
|
||||
{
|
||||
if ( node_ptr->adminState == MTC_ADMIN_STATE__UNLOCKED )
|
||||
{
|
||||
@ -4108,18 +4108,18 @@ int nodeLinkClass::manage_shadow_change ( string hostname )
|
||||
return (rc);
|
||||
}
|
||||
|
||||
/** Returns the number of compute hosts that are operationally 'enabled' */
|
||||
/** Returns the number of worker hosts that are operationally 'enabled' */
|
||||
int nodeLinkClass::enabled_compute_nodes ( void )
|
||||
{
|
||||
int temp_count = 0 ;
|
||||
for ( struct node * ptr = head ; ; ptr = ptr->next )
|
||||
{
|
||||
if (( is_compute( ptr )) &&
|
||||
if (( is_worker( ptr )) &&
|
||||
( ptr->operState == MTC_OPER_STATE__ENABLED ))
|
||||
{
|
||||
temp_count++ ;
|
||||
}
|
||||
else if (( is_compute_subfunction ( ptr )) &&
|
||||
else if (( is_worker_subfunction ( ptr )) &&
|
||||
( ptr->operState_subf == MTC_OPER_STATE__ENABLED ))
|
||||
{
|
||||
temp_count++ ;
|
||||
@ -4613,7 +4613,7 @@ void nodeLinkClass::manage_heartbeat_clear ( string hostname, iface_enum iface )
|
||||
}
|
||||
}
|
||||
|
||||
/** Manage compute host maintenance based on this heartbeat
|
||||
/** Manage worker host maintenance based on this heartbeat
|
||||
* degrade event and others that may be present at this moment */
|
||||
void nodeLinkClass::manage_heartbeat_degrade ( string hostname, iface_enum iface, bool clear_event )
|
||||
{
|
||||
@ -5665,7 +5665,7 @@ int nodeLinkClass::set_subf_info ( string hostname,
|
||||
|
||||
|
||||
|
||||
/**********************************************************************************
|
||||
/**********************************************************************************
|
||||
*
|
||||
* Name : update_host_functions
|
||||
*
|
||||
@ -5673,9 +5673,9 @@ int nodeLinkClass::set_subf_info ( string hostname,
|
||||
* delimited function string like.
|
||||
*
|
||||
* controller
|
||||
* compute
|
||||
* worker
|
||||
* storage
|
||||
* controller,compute
|
||||
* controller,worker
|
||||
* controller,storage
|
||||
*
|
||||
**********************************************************************************/
|
||||
@ -5702,16 +5702,16 @@ int nodeLinkClass::update_host_functions ( string hostname , string functions )
|
||||
{
|
||||
if ( node_ptr->function == CONTROLLER_TYPE )
|
||||
node_ptr->function_str = "controller" ;
|
||||
else if ( node_ptr->function == COMPUTE_TYPE )
|
||||
node_ptr->function_str = "compute" ;
|
||||
else if ( node_ptr->function == WORKER_TYPE )
|
||||
node_ptr->function_str = "worker" ;
|
||||
else if ( node_ptr->function == STORAGE_TYPE )
|
||||
node_ptr->function_str = "storage" ;
|
||||
else
|
||||
node_ptr->function_str = "" ;
|
||||
|
||||
if ( node_ptr->subfunction == COMPUTE_TYPE )
|
||||
if ( node_ptr->subfunction == WORKER_TYPE )
|
||||
{
|
||||
node_ptr->subfunction_str = "compute" ;
|
||||
node_ptr->subfunction_str = "worker" ;
|
||||
}
|
||||
else if ( node_ptr->subfunction == STORAGE_TYPE )
|
||||
{
|
||||
@ -5729,7 +5729,7 @@ int nodeLinkClass::update_host_functions ( string hostname , string functions )
|
||||
|
||||
|
||||
|
||||
/** Fetch the node type (compute or controller) by hostname */
|
||||
/** Fetch the node type (worker or controller) by hostname */
|
||||
int nodeLinkClass::get_nodetype ( string & hostname )
|
||||
{
|
||||
nodeLinkClass::node * node_ptr = getNode ( hostname ) ;
|
||||
@ -5753,12 +5753,12 @@ bool nodeLinkClass::is_controller ( struct nodeLinkClass::node * node_ptr )
|
||||
return (false);
|
||||
}
|
||||
|
||||
/** Check if a node is a compute */
|
||||
bool nodeLinkClass::is_compute_subfunction ( struct nodeLinkClass::node * node_ptr )
|
||||
/** Check if a node is a worker */
|
||||
bool nodeLinkClass::is_worker_subfunction ( struct nodeLinkClass::node * node_ptr )
|
||||
{
|
||||
if ( node_ptr != NULL )
|
||||
{
|
||||
if ( (node_ptr->subfunction & COMPUTE_TYPE ) == COMPUTE_TYPE )
|
||||
if ( (node_ptr->subfunction & WORKER_TYPE ) == WORKER_TYPE )
|
||||
{
|
||||
return (true);
|
||||
}
|
||||
@ -5766,12 +5766,12 @@ bool nodeLinkClass::is_compute_subfunction ( struct nodeLinkClass::node * node_p
|
||||
return (false);
|
||||
}
|
||||
|
||||
/** Check if a node is a compute */
|
||||
bool nodeLinkClass::is_compute ( struct nodeLinkClass::node * node_ptr )
|
||||
/** Check if a node is a worker */
|
||||
bool nodeLinkClass::is_worker ( struct nodeLinkClass::node * node_ptr )
|
||||
{
|
||||
if ( node_ptr != NULL )
|
||||
{
|
||||
if ( (node_ptr->function & COMPUTE_TYPE ) == COMPUTE_TYPE )
|
||||
if ( (node_ptr->function & WORKER_TYPE ) == WORKER_TYPE )
|
||||
{
|
||||
return (true);
|
||||
}
|
||||
@ -5823,24 +5823,24 @@ bool nodeLinkClass::is_controller ( string & hostname )
|
||||
return false ;
|
||||
}
|
||||
|
||||
/** Check if a node is a compute */
|
||||
bool nodeLinkClass::is_compute ( string & hostname )
|
||||
/** Check if a node is a worker */
|
||||
bool nodeLinkClass::is_worker ( string & hostname )
|
||||
{
|
||||
nodeLinkClass::node * node_ptr = getNode ( hostname );
|
||||
if ( node_ptr )
|
||||
{
|
||||
return is_compute(node_ptr);
|
||||
return is_worker(node_ptr);
|
||||
}
|
||||
return false ;
|
||||
}
|
||||
|
||||
/** Check if a node is a compute */
|
||||
bool nodeLinkClass::is_compute_subfunction ( string & hostname )
|
||||
/** Check if a node is a worker */
|
||||
bool nodeLinkClass::is_worker_subfunction ( string & hostname )
|
||||
{
|
||||
nodeLinkClass::node * node_ptr = getNode ( hostname );
|
||||
if ( node_ptr )
|
||||
{
|
||||
return is_compute_subfunction(node_ptr);
|
||||
return is_worker_subfunction(node_ptr);
|
||||
}
|
||||
return false ;
|
||||
}
|
||||
@ -7362,13 +7362,13 @@ void nodeLinkClass::force_full_enable ( struct nodeLinkClass::node * node_ptr )
|
||||
* start = False (means stop)
|
||||
*
|
||||
* MTC_CMD_STOP_CONTROL_SVCS
|
||||
* MTC_CMD_STOP_COMPUTE_SVCS
|
||||
* MTC_CMD_STOP_WORKER_SVCS
|
||||
* MTC_CMD_STOP_STORAGE_SVCS
|
||||
*
|
||||
* start = True
|
||||
*
|
||||
* MTC_CMD_START_CONTROL_SVCS
|
||||
* MTC_CMD_START_COMPUTE_SVCS
|
||||
* MTC_CMD_START_WORKER_SVCS
|
||||
* MTC_CMD_START_STORAGE_SVCS
|
||||
*
|
||||
* Returns : PASS = launch success
|
||||
@ -7389,16 +7389,16 @@ int nodeLinkClass::launch_host_services_cmd ( struct nodeLinkClass::node * node_
|
||||
{
|
||||
/* only supported subfunction (right now) is COMPUTE */
|
||||
if ( start == true )
|
||||
node_ptr->host_services_req.cmd = MTC_CMD_START_COMPUTE_SVCS ;
|
||||
node_ptr->host_services_req.cmd = MTC_CMD_START_WORKER_SVCS ;
|
||||
else
|
||||
node_ptr->host_services_req.cmd = MTC_CMD_STOP_COMPUTE_SVCS ;
|
||||
node_ptr->host_services_req.cmd = MTC_CMD_STOP_WORKER_SVCS ;
|
||||
}
|
||||
else if ( start == true )
|
||||
{
|
||||
if ( is_controller (node_ptr) )
|
||||
node_ptr->host_services_req.cmd = MTC_CMD_START_CONTROL_SVCS ;
|
||||
else if ( is_compute (node_ptr) )
|
||||
node_ptr->host_services_req.cmd = MTC_CMD_START_COMPUTE_SVCS ;
|
||||