diff --git a/centos_pkg_dirs b/centos_pkg_dirs index d0c9ab4..9b930c5 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -4,14 +4,9 @@ patch-alarm requests-toolbelt patch-scripts/EXAMPLE_0001 patch-scripts/EXAMPLE_0002 -patch-scripts/EXAMPLE_0003 patch-scripts/EXAMPLE_RR patch-scripts/EXAMPLE_MTCE -patch-scripts/EXAMPLE_NEUTRON -patch-scripts/EXAMPLE_AODH -patch-scripts/EXAMPLE_HEAT patch-scripts/EXAMPLE_VIM -patch-scripts/EXAMPLE_NOVA patch-scripts/EXAMPLE_SYSINV patch-scripts/EXAMPLE_SERVICE enable-dev-patch diff --git a/cgcs-patch/restart-info.html b/cgcs-patch/restart-info.html index e758fd3..ee4e306 100755 --- a/cgcs-patch/restart-info.html +++ b/cgcs-patch/restart-info.html @@ -29,109 +29,10 @@ table, th, td { - - ceilometer-polling - Daemon that polls Openstack services and build meters - Y - PMON - /etc/init.d/openstack-ceilometer-polling restart - - N - As batch_polled_samples is set to True, may lose some samples that - are in the pollsters memory if the process is restarted exactly - when they have just finished polling for samples and are about to - publish these samples to RabbitMQ. This is about 10 millisecond - window for cpu_source and 0.03 millisecond 1 second window for - meter related sources. - - N - - - ceilometer-agent-notification - Daemon that listens to notifications on message queue, converts - them to Events and Samples and applies pipeline actions - - Y - SM - sm-restart-safe service ceilometer-agent-notification
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/ceilometer-agent-notification stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/ceilometer-agent-notification start - - - N - May lose some samples/events if the process is restarted while they - are being transformed or converted. - - N - - - ceilometer-collector - Daemon that gathers and records event and metering data created by - notification and polling agents - - Y - SM - sm-restart-safe service ceilometer-collector
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/ceilometer-collector stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/ceilometer-collector - start - - - N - May lose some samples/events if the process is restarted while they - are being persisted in Postgres DB. This is a tiny window - especially with recent optimization work (no message signature - verification, one single call to create_sample stored proc).
- Note: Making sure that child processes and their database - connections are released when a parent process is stopped is part - of collector functionality. It is not specific to in-service - patching. - - N - - - ceilometer-api - Service to query and view data recorded by the collector - Y - SM - sm-restart-safe service ceilometer-api
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/ceilometer-api stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/ceilometer-api start - - - N - While the service is restarted, horizon or CLI ceilometer request - will fail. Horizon request will be re-established automatically in - its next polling interval. CLI command needs to be re-issued. - - N - - - ceilometer-expirer-active - Cron job that purges expired samples and events as well as related - meter and resource data - - Y - CRON - N/A

- To run the expirer manually: /usr/bin/ceilometer-expirer-active - - - N - There is no need to restart after patch. The change will take - effect next time the expirer cron job is run.
- Unless there are new features specifically planned for expirer, - this code is very stable. - - N - haproxy A Proxy service that is responsible for forwarding external REST - API requests to Open Stack and Titanium Cloud services that listening on the + API requests to OpenStack and StarlingX services that listening on the internal interfaces. Y @@ -197,75 +98,6 @@ table, th, td { N - - neutron-server - Service that manages network functions - Y - SM - sm-restart-safe service neutron-server
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/neutron-server stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/neutron-server start - - /bin/neutron-restart neutron-server
or
/bin/neutron-restart --all - N - 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 workers to fail while it is restarting. - - N - - - neutron-dhcp-agent - Agent on worker node that manages DHCP servers for tenant - networks - - Y - PMON - /etc/init.d/neutron-dhcp-agent restart - /bin/neutron-restart neutron-dhcp-agent
or
/bin/neutron-restart --all - N - Will prevent binding new DHCP servers while it is down. Requires - special handling to kill metadata haproxy processes for networks. - - Y - - - neutron-metadata-agent - Agent on worker node serving metadata to nodes - Y - PMON - /etc/init.d/neutron-metadata-agent restart - /bin/neutron-restart neutron-metadata-agent
or
/bin/neutron-restart --all - N - Nodes will not be able to receive metadata while it is down - N - - - neutron-sriov-nic-agent - Agent on worker node responsible for setting SR-IOV port - information - - Y - PMON - /etc/init.d/neutron-sriov-nic-agent restart - /bin/neutron-restart neutron-sriov-nic-agent
or
/bin/neutron-restart --all - N - Will not be able to set device parameters while restarting - N - - - neutron-bgp-dragent - BGP dynamic routing agent on controller node - - Y - PMON - /etc/init.d/neutron-bgp-dragent restart - /bin/neutron-restart neutron-bgp-dragent
or
/bin/neutron-restart --all - N - Will not be able to set device parameters while restarting - N - keystone-all Keystone provides services that support an identity, token @@ -286,224 +118,9 @@ table, th, td { N - - aodh-api - Aodh service that handles API requests for openstack alarming. - Y - SM - sm-restart-safe service aodh-api
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/aodh-api stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/aodh-api start - - - N - While the service is restarted, the outstanding requests will fail - and new requests will get connection error until the service is - re-enabled. - - N - - - aodh-evaluator - Aodh service that performs threshold evaluation for openstack - alarming. - - Y - SM - sm-restart-safe service aodh-evaluator
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/aodh-evaluator stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/aodh-evaluator start - - - N - While the service is restarted no openstack alarm threshold - evaluations will be executed until the service is re-enabled. - - N - - - aodh-listener - Aodh service that generates alarms based on events. - Y - SM - sm-restart-safe service aodh-listener
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/aodh-listener stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/aodh-listener start - - - N - While the service is restarted no openstack event based alarms will - be generated until the service is re-enabled. - - N - - - aodh-notifier - Aodh service that sends openstack alarm notifications. - Y - SM - sm-restart-safe service aodh-notifier
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/aodh-notifier stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/aodh-notifier start - - - N - While the service is restarted no openstack alarm threshold - notifications will be issued until the service is re-enabled. - - N - - - aodh-expirer-active - Cron job that purges expired openstack alarms - Y - CRON - N/A

- To run the expirer manually: /usr/bin/aodh-expirer-active - - - N - There is no need to restart after patch. The change will take - effect next time the expirer cron job is run.
- Unless there are new features specifically planned for expirer, - this code is very stable. - - N - - - heat-api - Heat service for API requests for openstack orchestration. - Y - SM - sm-restart-safe service heat-api
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/heat-api stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/heat-api start - - - N - While the service is restarted, horizon or CLI heat requests will - fail. Horizon will re-established automatically. CLI commands needs - to be re-issued. Heat stack updates in progress may fail. - - N - - - heat-api-cfn - Heat service for AWS Cloudformation API requests. - Y - SM - sm-restart-safe service heat-api-cfn
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/heat-api-cfn stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/heat-api-cfn start - - - N - While the service is restarted, cloudformation API requests such as - autoscaling will not be processed. - - N - - - heat-api-cloudwatch - Heat service for AWS Cloudwatch metric collection. - Y - SM - sm-restart-safe service heat-api-cloudwatch
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/heat-api-cloudwatch stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/heat-api-cloudwatch start - - - N - While the service is restarted, stats sent from VMs will not be - processed. - - N - - - heat-engine - Heat service for AWS Cloudwatch metric collection. - Y - SM - sm-restart-safe service heat-engine
- which runs the following:

- /bin/sh /usr/lib/ocf/resource.d/openstack/heat-engine stop
- /bin/sh /usr/lib/ocf/resource.d/openstack/heat-engine start - - - N - While the service is restarted, openstrack heat orchestration - commands will not be processed. Stacks being created, deleted or - updated will fail and need to be re-initiated. - - N - - - heat-purge-deleted-active - Cron job that purges deleted openstack heat stacks from the - database - - Y - CRON - N/A

- To run the expirer manually: /usr/bin/heat-purge-deleted-active - - - N - There is no need to restart after patch. The change will take - effect next time the cron job is run.
- Unless there are new features specifically planned, this code is - very stable. - - N - - - Glance - Glance imaging service - a single script restarts both glance-api - and glance-registry. - - Y - SM - /usr/bin/restart-glance
- - - N - While the service is restarted, the outstanding requests will - continue and new requests will get connection error until the - service is re-enabled. The graceful restart takes more than 30 - secs the process is killed. Timers are configurable from the - restart script - - N - - - Cinder - Cinder volume service - a single script restarts cinder-volume, - cinder-scheduler, cinder-api and cinder-backup. - - Y - SM - /usr/bin/restart-cinder
- - - N - While the service is restarted, the outstanding requests will - continue and new requests will get connection error until the - service is re-enabled. Timers are configurable from the restart - script - - N - Horizon - Horizon - Openstack Dashboard GUI used to control openstack and Titanium Cloud - operations + Horizon - Openstack Dashboard GUI Y SM @@ -520,7 +137,7 @@ table, th, td { IO-Monitor - Daemon which monitors cinder devices and raises alarms for excessive storage IO load. + Daemon which monitors devices and raises alarms for excessive storage IO load. Y PMON pmon-restart io-monitor-manager @@ -572,104 +189,6 @@ table, th, td { No impact. This service is for design use only. N - - nova-api - Nova API Service - Y - SM - sm-restart-safe service nova-api
- /bin/nova-restart - N - While the service is restarted, the outstanding requests will - fail and new requests will get connection error until the service - is re-enabled. - - N - - - nova-placement-api - Nova Placement API Service - Y - SM - sm-restart-safe service nova-placement-api
- /bin/nova-restart - N - While the service is restarted, the outstanding requests will - fail and new requests will get connection error until the service - is re-enabled. - - N - - - nova-conductor - Nova Conductor Service - Y - SM - sm-restart-safe service nova-conductor
- /bin/nova-restart - N - While the service is restarted, the outstanding requests will - fail and new requests will get connection error until the service - is re-enabled. - - N - - - nova-scheduler - Nova Scheduler Service - Y - SM - sm-restart-safe service nova-scheduler
- /bin/nova-restart - N - While the service is restarted, the outstanding requests will - fail and new requests will get connection error until the service - is re-enabled. - - N - - - nova-console-auth - Nova Console Auth Service - Y - SM - sm-restart-safe service nova-console-auth
- /bin/nova-restart - N - While the service is restarted, the outstanding requests will - fail and new requests will get connection error until the service - is re-enabled. - - N - - - nova-novnc - Nova VNC Service - Y - SM - sm-restart-safe service nova-novnc
- /bin/nova-restart - N - While the service is restarted, the outstanding requests will - fail and new requests will get connection error until the service - is re-enabled. - - N - - - nova-compute - Nova Compute Service - Y - PMON - /usr/local/sbin/pmon-restart nova-compute
- /bin/nova-restart - N - While the services is restarted, the outstanding requests will - fail and new requests will get connection error until the service - is re-enabled. - - N - ceph-osd & ceph-mon Ceph OSD and Monitor processes @@ -685,7 +204,7 @@ table, th, td { the same time. Restarting it on controller-0, controller-1 & storage-0, - at the same time with glance, cinder, nova, ceph-rest-api, sysinv or ceph-manager + at the same time with ceph-rest-api, sysinv or ceph-manager on the active controller should be avoided due to ~30 secs delay to ceph APIs. This delay happens when any of the ceph-mon changes state and may cause timeouts when dependent services restart. Recommendations: (1) On the active controller, diff --git a/patch-scripts/EXAMPLE_0003/centos/EXAMPLE_0003.spec b/patch-scripts/EXAMPLE_0003/centos/EXAMPLE_0003.spec deleted file mode 100644 index 6821567..0000000 --- a/patch-scripts/EXAMPLE_0003/centos/EXAMPLE_0003.spec +++ /dev/null @@ -1,27 +0,0 @@ -Name: EXAMPLE_0003 -Summary: TIS In-Service Patch Scripts Example, using process-restart -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -Source0: example-process-restart - -%install - install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name} - -%description -%{summary} - -%files -%defattr(-,root,root,-) -%{_patch_scripts}/* - -%post -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - -%preun -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - diff --git a/patch-scripts/EXAMPLE_0003/centos/build_srpm.data b/patch-scripts/EXAMPLE_0003/centos/build_srpm.data deleted file mode 100644 index ff90698..0000000 --- a/patch-scripts/EXAMPLE_0003/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -COPY_LIST="scripts/*" -TIS_PATCH_VER=0 diff --git a/patch-scripts/EXAMPLE_0003/scripts/example-process-restart b/patch-scripts/EXAMPLE_0003/scripts/example-process-restart deleted file mode 100644 index 1af3428..0000000 --- a/patch-scripts/EXAMPLE_0003/scripts/example-process-restart +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# This script provides an example in-service patching restart, -# triggering a restart of the patching daemons themselves -# - -# -# The patching subsystem provides a patch-functions bash source file -# with useful function and variable definitions. -# -. /etc/patching/patch-functions - -# -# We can now check to see what type of node we're on, if it's locked, etc, -# and act accordingly -# - -# -# Declare an overall script return code -# -declare -i GLOBAL_RC=$PATCH_STATUS_OK - -# processes that run on all nodes -processes_to_restart="sysinv-agent ceilometer-polling" -/usr/local/sbin/patch-restart-processes sysinv-agent ceilometer-polling -if [ $? != 0 ] ; then - loginfo "patching restart failed" - loginfo "... process-restart ${processes_to_restart}" - exit ${PATCH_STATUS_FAILED} -fi - -# -# Next, handle restarting the patch-controller. -# -if is_controller -then - processes_to_restart="ceilometer-api ceilometer-agent-notification ceilometer-collector" - /usr/local/sbin/patch-restart-processes ${processes_to_restart} - if [ $? != 0 ] ; then - loginfo "patching restart failed" - loginfo "... process-restart ${processes_to_restart}" - exit ${PATCH_STATUS_FAILED} - fi -fi - - -# -# Exit the script with the overall return code -# -exit $GLOBAL_RC - diff --git a/patch-scripts/EXAMPLE_AODH/centos/EXAMPLE_AODH.spec b/patch-scripts/EXAMPLE_AODH/centos/EXAMPLE_AODH.spec deleted file mode 100644 index 505ca04..0000000 --- a/patch-scripts/EXAMPLE_AODH/centos/EXAMPLE_AODH.spec +++ /dev/null @@ -1,27 +0,0 @@ -Name: EXAMPLE_AODH -Summary: TIS In-Service Aodh Patch Script Example -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -Source0: aodh-restart-example - -%install - install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name} - -%description -%{summary} - -%files -%defattr(-,root,root,-) -%{_patch_scripts}/* - -%post -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - -%preun -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - diff --git a/patch-scripts/EXAMPLE_AODH/centos/build_srpm.data b/patch-scripts/EXAMPLE_AODH/centos/build_srpm.data deleted file mode 100644 index ff90698..0000000 --- a/patch-scripts/EXAMPLE_AODH/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -COPY_LIST="scripts/*" -TIS_PATCH_VER=0 diff --git a/patch-scripts/EXAMPLE_AODH/scripts/aodh-restart-example b/patch-scripts/EXAMPLE_AODH/scripts/aodh-restart-example deleted file mode 100644 index a4534f0..0000000 --- a/patch-scripts/EXAMPLE_AODH/scripts/aodh-restart-example +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# This script provides an example in-service patching restart, -# triggering a restart of the patching daemons themselves -# - -# -# The patching subsystem provides a patch-functions bash source file -# with useful function and variable definitions. -# -. /etc/patching/patch-functions - -# -# We can now check to see what type of node we're on, if it's locked, etc, -# and act accordingly -# - -# -# Declare an overall script return code -# -declare -i GLOBAL_RC=$PATCH_STATUS_OK - - -# AODH only runs on the controller - -if is_controller -then - processes_to_restart="aodh-api aodh-evaluator aodh-listener aodh-notifier" - /usr/local/sbin/patch-restart-processes ${processes_to_restart} - if [ $? != 0 ] ; then - loginfo "patching restart failed" - loginfo "... process-restart ${processes_to_restart}" - exit ${PATCH_STATUS_FAILED} - fi -fi - - -# -# Exit the script with the overall return code -# -exit $GLOBAL_RC - diff --git a/patch-scripts/EXAMPLE_HEAT/centos/EXAMPLE_HEAT.spec b/patch-scripts/EXAMPLE_HEAT/centos/EXAMPLE_HEAT.spec deleted file mode 100644 index 6a05d76..0000000 --- a/patch-scripts/EXAMPLE_HEAT/centos/EXAMPLE_HEAT.spec +++ /dev/null @@ -1,27 +0,0 @@ -Name: EXAMPLE_HEAT -Summary: TIS In-Service Heat Patch Script Example -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -Source0: heat-restart-example - -%install - install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name} - -%description -%{summary} - -%files -%defattr(-,root,root,-) -%{_patch_scripts}/* - -%post -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - -%preun -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - diff --git a/patch-scripts/EXAMPLE_HEAT/centos/build_srpm.data b/patch-scripts/EXAMPLE_HEAT/centos/build_srpm.data deleted file mode 100644 index ff90698..0000000 --- a/patch-scripts/EXAMPLE_HEAT/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -COPY_LIST="scripts/*" -TIS_PATCH_VER=0 diff --git a/patch-scripts/EXAMPLE_HEAT/scripts/heat-restart-example b/patch-scripts/EXAMPLE_HEAT/scripts/heat-restart-example deleted file mode 100644 index e982eae..0000000 --- a/patch-scripts/EXAMPLE_HEAT/scripts/heat-restart-example +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# This script provides an example in-service patching restart, -# triggering a restart of the patching daemons themselves -# - -# -# The patching subsystem provides a patch-functions bash source file -# with useful function and variable definitions. -# -. /etc/patching/patch-functions - -# -# We can now check to see what type of node we're on, if it's locked, etc, -# and act accordingly -# - -# -# Declare an overall script return code -# -declare -i GLOBAL_RC=$PATCH_STATUS_OK - - -# HEAT only runs on the controller - -if is_controller -then - processes_to_restart="heat-api heat-engine heat-api-cloudwatch heat-api-cfn" - /usr/local/sbin/patch-restart-processes ${processes_to_restart} - if [ $? != 0 ] ; then - loginfo "patching restart failed" - loginfo "... process-restart ${processes_to_restart}" - exit ${PATCH_STATUS_FAILED} - fi -fi - - -# -# Exit the script with the overall return code -# -exit $GLOBAL_RC - diff --git a/patch-scripts/EXAMPLE_NEUTRON/centos/EXAMPLE_NEUTRON.spec b/patch-scripts/EXAMPLE_NEUTRON/centos/EXAMPLE_NEUTRON.spec deleted file mode 100644 index 38f32fa..0000000 --- a/patch-scripts/EXAMPLE_NEUTRON/centos/EXAMPLE_NEUTRON.spec +++ /dev/null @@ -1,27 +0,0 @@ -Name: EXAMPLE_NEUTRON -Summary: TIS In-Service Neutron Patch Script Example -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -Source0: neutron-restart-example - -%install - install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name} - -%description -%{summary} - -%files -%defattr(-,root,root,-) -%{_patch_scripts}/* - -%post -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - -%preun -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - diff --git a/patch-scripts/EXAMPLE_NEUTRON/centos/build_srpm.data b/patch-scripts/EXAMPLE_NEUTRON/centos/build_srpm.data deleted file mode 100644 index ff90698..0000000 --- a/patch-scripts/EXAMPLE_NEUTRON/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -COPY_LIST="scripts/*" -TIS_PATCH_VER=0 diff --git a/patch-scripts/EXAMPLE_NEUTRON/scripts/neutron-restart-example b/patch-scripts/EXAMPLE_NEUTRON/scripts/neutron-restart-example deleted file mode 100644 index 2fa3936..0000000 --- a/patch-scripts/EXAMPLE_NEUTRON/scripts/neutron-restart-example +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# This script provides an example in-service patching restart for all neutron processes -# - -# -# The patching subsystem provides a patch-functions bash source file -# with useful function and variable definitions. -# -. /etc/patching/patch-functions - -# -# We can now check to see what type of node we're on, if it's locked, etc, -# and act accordingly -# - -# -# Declare an overall script return code -# -declare -i GLOBAL_RC=$PATCH_STATUS_OK - -# NOTE: The following restart example code could be implemented in scripts -# owned by the various domains, with a single high-level call in the patch-script. -# This would be the preferred method, in fact, to ensure the patch-scripts -# themselves are simple and clean. -# - -/bin/neutron-restart --all -if [ $? -ne 0 ] -then - GLOBAL_RC=$PATCH_STATUS_FAILED -fi -exit $GLOBAL_RC - diff --git a/patch-scripts/EXAMPLE_NOVA/centos/EXAMPLE_NOVA.spec b/patch-scripts/EXAMPLE_NOVA/centos/EXAMPLE_NOVA.spec deleted file mode 100644 index 47ce4ea..0000000 --- a/patch-scripts/EXAMPLE_NOVA/centos/EXAMPLE_NOVA.spec +++ /dev/null @@ -1,27 +0,0 @@ -Name: EXAMPLE_NOVA -Summary: TIS In-Service Nova Patch Script Example -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -Source0: nova-restart-example - -%install - install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name} - -%description -%{summary} - -%files -%defattr(-,root,root,-) -%{_patch_scripts}/* - -%post -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - -%preun -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - diff --git a/patch-scripts/EXAMPLE_NOVA/centos/build_srpm.data b/patch-scripts/EXAMPLE_NOVA/centos/build_srpm.data deleted file mode 100644 index ff90698..0000000 --- a/patch-scripts/EXAMPLE_NOVA/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -COPY_LIST="scripts/*" -TIS_PATCH_VER=0 diff --git a/patch-scripts/EXAMPLE_NOVA/scripts/nova-restart-example b/patch-scripts/EXAMPLE_NOVA/scripts/nova-restart-example deleted file mode 100644 index 56a9387..0000000 --- a/patch-scripts/EXAMPLE_NOVA/scripts/nova-restart-example +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# This script provides an example in-service patching restart for all neutron processes -# - -# -# The patching subsystem provides a patch-functions bash source file -# with useful function and variable definitions. -# -. /etc/patching/patch-functions - -# -# We can now check to see what type of node we're on, if it's locked, etc, -# and act accordingly -# - -# -# Declare an overall script return code -# -declare -i GLOBAL_RC=$PATCH_STATUS_OK - -# NOTE: The following restart example code could be implemented in scripts -# owned by the various domains, with a single high-level call in the patch-script. -# This would be the preferred method, in fact, to ensure the patch-scripts -# themselves are simple and clean. -# - -/bin/nova-restart -if [ $? -ne 0 ] -then - GLOBAL_RC=$PATCH_STATUS_FAILED -fi -exit $GLOBAL_RC diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/scripts/restart-script b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/scripts/restart-script index af11441..fa39941 100644 --- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/scripts/restart-script +++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/scripts/restart-script @@ -6,7 +6,7 @@ # # -# This script provides an example in-service patching restart for all neutron processes +# This script provides an example in-service patching restart for maintenance and sysinv processes # # diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/scripts/restart-script b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/scripts/restart-script index c233dac..6003582 100644 --- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/scripts/restart-script +++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/scripts/restart-script @@ -6,7 +6,7 @@ # # -# This script provides an example in-service patching restart for all neutron processes +# This script provides an example in-service patching restart for all NFV and Sysinv processes # # diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/scripts/restart-script b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/scripts/restart-script index fcd7e98..34a0f32 100644 --- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/scripts/restart-script +++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/scripts/restart-script @@ -6,7 +6,7 @@ # # -# This script provides an example in-service patching restart for all neutron processes +# This script provides an example in-service patching restart for maintenance processes # # @@ -31,14 +31,6 @@ declare -i GLOBAL_RC=$PATCH_STATUS_OK # themselves are simple and clean. # -# NOVA -bash -x /bin/nova-restart -if [ $? -ne 0 ] -then - loginfo "Nova patching restart failed" - GLOBAL_RC=$PATCH_STATUS_FAILED -fi - # MTCE bash -x /usr/local/sbin/patch-restart-mtce \ mtcalarmd mtclogd \ diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/scripts/restart-script b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/scripts/restart-script index 3198b6b..d986459 100644 --- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/scripts/restart-script +++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/scripts/restart-script @@ -6,7 +6,7 @@ # # -# This script provides an example in-service patching restart for all neutron processes +# This script provides an example in-service patching restart for Horizon and Sysinv processes # # @@ -31,14 +31,6 @@ declare -i GLOBAL_RC=$PATCH_STATUS_OK # themselves are simple and clean. # -# NOVA -bash -x /bin/nova-restart -if [ $? -ne 0 ] -then - loginfo "Nova patching restart failed" - GLOBAL_RC=$PATCH_STATUS_FAILED -fi - # HORIZON if is_controller then diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/scripts/restart-script b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/scripts/restart-script index f6bab9f..73afb7a 100644 --- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/scripts/restart-script +++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/scripts/restart-script @@ -6,7 +6,7 @@ # # -# This script provides an example in-service patching restart for all neutron processes +# This script provides an example in-service patching restart for all maintenance processes # # diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/scripts/restart-script b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/scripts/restart-script index a4f7991..747d1a9 100644 --- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/scripts/restart-script +++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/scripts/restart-script @@ -6,7 +6,8 @@ # # -# This script provides an example in-service patching restart for all neutron processes +# This script provides an example in-service patching restart for all Maintenance, +# Horizon, Sysinv and NFV processes # # @@ -31,14 +32,6 @@ declare -i GLOBAL_RC=$PATCH_STATUS_OK # themselves are simple and clean. # -# NOVA -bash -x /bin/nova-restart -if [ $? -ne 0 ] -then - loginfo "Nova patching restart failed" - GLOBAL_RC=$PATCH_STATUS_FAILED -fi - # MTCE bash -x /usr/local/sbin/patch-restart-mtce \ mtcalarmd mtclogd \ diff --git a/patch-scripts/test-patches/INSVC_COMPUTE/scripts/compute-restart b/patch-scripts/test-patches/INSVC_COMPUTE/scripts/compute-restart index 7c1b627..dd3883f 100644 --- a/patch-scripts/test-patches/INSVC_COMPUTE/scripts/compute-restart +++ b/patch-scripts/test-patches/INSVC_COMPUTE/scripts/compute-restart @@ -25,7 +25,7 @@ # declare -i GLOBAL_RC=$PATCH_STATUS_OK -# TODO: Add restart of nova-compute? +# Add restart commands here... # # Exit the script with the overall return code diff --git a/patch-scripts/test-patches/INSVC_NOVA/centos/INSVC_NOVA.spec b/patch-scripts/test-patches/INSVC_NOVA/centos/INSVC_NOVA.spec deleted file mode 100644 index 071ca4d..0000000 --- a/patch-scripts/test-patches/INSVC_NOVA/centos/INSVC_NOVA.spec +++ /dev/null @@ -1,27 +0,0 @@ -Name: INSVC_NOVA -Summary: In-Service Nova Patch Script -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -Source0: nova-restart - -%install - install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name} - -%description -%{summary} - -%files -%defattr(-,root,root,-) -%{_patch_scripts}/* - -%post -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - -%preun -cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/ -exit 0 - diff --git a/patch-scripts/test-patches/INSVC_NOVA/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_NOVA/centos/build_srpm.data deleted file mode 100644 index ff90698..0000000 --- a/patch-scripts/test-patches/INSVC_NOVA/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -COPY_LIST="scripts/*" -TIS_PATCH_VER=0 diff --git a/patch-scripts/test-patches/INSVC_NOVA/scripts/nova-restart b/patch-scripts/test-patches/INSVC_NOVA/scripts/nova-restart deleted file mode 100644 index 1591d0b..0000000 --- a/patch-scripts/test-patches/INSVC_NOVA/scripts/nova-restart +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2017 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# This script provides an example in-service patching restart for all nova processes -# - -# -# The patching subsystem provides a patch-functions bash source file -# with useful function and variable definitions. -# -. /etc/patching/patch-functions - -# -# We can now check to see what type of node we're on, if it's locked, etc, -# and act accordingly -# - -# -# Declare an overall script return code -# -declare -i GLOBAL_RC=$PATCH_STATUS_OK - -# NOTE: The following restart example code could be implemented in scripts -# owned by the various domains, with a single high-level call in the patch-script. -# This would be the preferred method, in fact, to ensure the patch-scripts -# themselves are simple and clean. -# - -/bin/nova-restart -if [ $? -ne 0 ] -then - GLOBAL_RC=$PATCH_STATUS_FAILED -fi -exit $GLOBAL_RC diff --git a/patch-scripts/test-patches/RR_NOVA/centos/RR_NOVA.spec b/patch-scripts/test-patches/RR_NOVA/centos/RR_NOVA.spec deleted file mode 100644 index 7493fd7..0000000 --- a/patch-scripts/test-patches/RR_NOVA/centos/RR_NOVA.spec +++ /dev/null @@ -1,21 +0,0 @@ -Name: RR_NOVA -Summary: Reboot-Required Nova Patch -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River - -%description -%{summary} - -%files - -%post -touch /var/run/node_is_patched_rr -exit 0 - -%preun -touch /var/run/node_is_patched_rr -exit 0 - diff --git a/patch-scripts/test-patches/RR_NOVA/centos/build_srpm.data b/patch-scripts/test-patches/RR_NOVA/centos/build_srpm.data deleted file mode 100644 index b12438c..0000000 --- a/patch-scripts/test-patches/RR_NOVA/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -ALLOW_EMPTY_RPM=true -TIS_PATCH_VER=0