diff --git a/openstack/python-ceilometer/python-ceilometer/static/ceilometer-polling b/openstack/python-ceilometer/python-ceilometer/static/ceilometer-polling index 1b402485..fa96032c 100644 --- a/openstack/python-ceilometer/python-ceilometer/static/ceilometer-polling +++ b/openstack/python-ceilometer/python-ceilometer/static/ceilometer-polling @@ -28,16 +28,16 @@ start() fi . $PLATFORM_CONF_FILE - if [[ "$nodetype" == "compute" || "$subfunction" == *"compute"* ]] ; then - if [ ! -f $VOLATILE_COMPUTE_CONFIG_COMPLETE ]; then + if [[ "$nodetype" == "worker" || "$subfunction" == *"worker"* ]] ; then + if [ ! -f $VOLATILE_WORKER_CONFIG_COMPLETE ]; then # Do not start polling until compute manifests have been applied - echo "Waiting for $VOLATILE_COMPUTE_CONFIG_COMPLETE" + echo "Waiting for $VOLATILE_WORKER_CONFIG_COMPLETE" exit 0 - elif [ -f $VOLATILE_DISABLE_COMPUTE_SERVICES ]; then + elif [ -f $VOLATILE_DISABLE_WORKER_SERVICES ]; then # Do not start polling if compute services are disabled. This can # happen during an upgrade when controller-1 is running a newer # load than controller-0. - echo "Waiting for $VOLATILE_DISABLE_COMPUTE_SERVICES" + echo "Waiting for $VOLATILE_DISABLE_WORKER_SERVICES" exit 0 fi fi diff --git a/openstack/python-ceilometer/python-ceilometer/static/ceilometer-polling-compute.conf.pmon.centos b/openstack/python-ceilometer/python-ceilometer/static/ceilometer-polling-compute.conf.pmon.centos index adafc727..84b13370 100644 --- a/openstack/python-ceilometer/python-ceilometer/static/ceilometer-polling-compute.conf.pmon.centos +++ b/openstack/python-ceilometer/python-ceilometer/static/ceilometer-polling-compute.conf.pmon.centos @@ -14,13 +14,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. +subfunction = worker ; Optional label. ; Manage this process in the context of a combo host subfunction - ; Choices: compute or storage. + ; Choices: worker or storage. ; when specified pmond will wait for - ; /var/run/.compute_config_complete or + ; /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 diff --git a/openstack/python-neutron/centos/files/neutron-dhcp-agent.pmon b/openstack/python-neutron/centos/files/neutron-dhcp-agent.pmon index 1a37143c..d00fa518 100644 --- a/openstack/python-neutron/centos/files/neutron-dhcp-agent.pmon +++ b/openstack/python-neutron/centos/files/neutron-dhcp-agent.pmon @@ -12,13 +12,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 diff --git a/openstack/python-neutron/centos/files/neutron-metadata-agent.pmon b/openstack/python-neutron/centos/files/neutron-metadata-agent.pmon index 0fe64dd8..64e43c45 100644 --- a/openstack/python-neutron/centos/files/neutron-metadata-agent.pmon +++ b/openstack/python-neutron/centos/files/neutron-metadata-agent.pmon @@ -12,13 +12,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 diff --git a/openstack/python-neutron/centos/files/neutron-sriov-nic-agent.pmon b/openstack/python-neutron/centos/files/neutron-sriov-nic-agent.pmon index 3dd6d724..fedd8ab1 100644 --- a/openstack/python-neutron/centos/files/neutron-sriov-nic-agent.pmon +++ b/openstack/python-neutron/centos/files/neutron-sriov-nic-agent.pmon @@ -12,13 +12,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 diff --git a/openstack/python-nova/centos/files/kvm_timer_advance_setup.service b/openstack/python-nova/centos/files/kvm_timer_advance_setup.service index c81dabcf..74589119 100644 --- a/openstack/python-nova/centos/files/kvm_timer_advance_setup.service +++ b/openstack/python-nova/centos/files/kvm_timer_advance_setup.service @@ -1,7 +1,7 @@ [Unit] Description=KVM Timer Advance Setup After=openstack-nova-compute-setup.service -Before=nova-compute.service goenabled-compute.service +Before=nova-compute.service goenabled-worker.service [Service] Type=simple diff --git a/openstack/python-nova/centos/files/nova-restart b/openstack/python-nova/centos/files/nova-restart index 0ea5f035..426fead7 100644 --- a/openstack/python-nova/centos/files/nova-restart +++ b/openstack/python-nova/centos/files/nova-restart @@ -29,7 +29,7 @@ declare -i GLOBAL_RC=$PATCH_STATUS_OK # # Processes that run with compute subfunction # -if is_compute || is_cpe +if is_worker || is_cpe then processes_to_restart="nova-compute" /usr/local/sbin/patch-restart-processes nova-compute diff --git a/openstack/python-nova/python-nova/nova_setup_cpusets b/openstack/python-nova/python-nova/nova_setup_cpusets index a2881702..d8a18529 100644 --- a/openstack/python-nova/python-nova/nova_setup_cpusets +++ b/openstack/python-nova/python-nova/nova_setup_cpusets @@ -1,13 +1,13 @@ #!/bin/bash # -# Copyright (c) 2013-2017 Wind River Systems, Inc. +# Copyright (c) 2013-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # # This script is intended to set up the cpusets for use by nova-compute. -# It should only run on compute nodes, and it must be run after the +# It should only run on worker nodes, and it must be run after the # /etc/nova/nova.conf file has been modified by packstack since it # extracts the "vcpu_pin_set" value from that file. # @@ -62,9 +62,9 @@ start() # Do not continue if the host has not been configured. We can't do # anything until the nova.conf file has been updated. - if [ ! -f ${INITIAL_COMPUTE_CONFIG_COMPLETE} ] + if [ ! -f ${INITIAL_WORKER_CONFIG_COMPLETE} ] then - log "Initial compute configuration is not complete, nothing to do" + log "Initial worker configuration is not complete, nothing to do" exit 0 fi diff --git a/openstack/python-nova/python-nova/openstack-nova-compute-setup.service b/openstack/python-nova/python-nova/openstack-nova-compute-setup.service index 4fbfdeee..e2818d55 100644 --- a/openstack/python-nova/python-nova/openstack-nova-compute-setup.service +++ b/openstack/python-nova/python-nova/openstack-nova-compute-setup.service @@ -1,7 +1,7 @@ [Unit] Description=OpenStack Nova Compute Server Pre-Startup -After=syslog.target compute-config-gate.service -Before=nova-compute.service goenabled-compute.service +After=syslog.target worker-config-gate.service +Before=nova-compute.service goenabled-worker.service [Service] Type=oneshot