diff --git a/files/fuel-ha-utils/ocf/ceilometer-agent-central b/files/fuel-ha-utils/ocf/ceilometer-agent-central index f962ca9466..2e93e9d059 100644 --- a/files/fuel-ha-utils/ocf/ceilometer-agent-central +++ b/files/fuel-ha-utils/ocf/ceilometer-agent-central @@ -38,6 +38,8 @@ OCF_RESKEY_user_default="ceilometer" OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" OCF_RESKEY_amqp_server_port_default="5673" +: ${HA_LOGTAG="ocf-ceilometer-agent-central"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} diff --git a/files/fuel-ha-utils/ocf/ceilometer-agent-compute b/files/fuel-ha-utils/ocf/ceilometer-agent-compute index 5a791a775a..da6d312c75 100644 --- a/files/fuel-ha-utils/ocf/ceilometer-agent-compute +++ b/files/fuel-ha-utils/ocf/ceilometer-agent-compute @@ -38,6 +38,8 @@ OCF_RESKEY_user_default="ceilometer" OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid" OCF_RESKEY_amqp_server_port_default="5673" +: ${HA_LOGTAG="ocf-ceilometer-agent-compute"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} diff --git a/files/fuel-ha-utils/ocf/ceilometer-alarm-evaluator b/files/fuel-ha-utils/ocf/ceilometer-alarm-evaluator index 7bde704608..8969e29c65 100644 --- a/files/fuel-ha-utils/ocf/ceilometer-alarm-evaluator +++ b/files/fuel-ha-utils/ocf/ceilometer-alarm-evaluator @@ -36,6 +36,8 @@ OCF_RESKEY_config_default="/etc/ceilometer/ceilometer.conf" OCF_RESKEY_user_default="ceilometer" OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" +: ${HA_LOGTAG="ocf-ceilometer-alarm-evaluator"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} diff --git a/files/fuel-ha-utils/ocf/haproxy b/files/fuel-ha-utils/ocf/haproxy index c6537b98fc..b6574ed2db 100755 --- a/files/fuel-ha-utils/ocf/haproxy +++ b/files/fuel-ha-utils/ocf/haproxy @@ -30,6 +30,8 @@ OCF_RESKEY_conffile_default="/etc/haproxy/haproxy.cfg" OCF_RESKEY_pidfile_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" OCF_RESKEY_binpath_default="/usr/sbin/haproxy" +: ${HA_LOGTAG="ocf-haproxy"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_conffile=${OCF_RESKEY_conffile_default}} : ${OCF_RESKEY_pidfile=${OCF_RESKEY_pidfile_default}} : ${OCF_RESKEY_binpath=${OCF_RESKEY_binpath_default}} @@ -164,7 +166,7 @@ haproxy_start() fi # run the haproxy binary - "${COMMAND}" ${OCF_RESKEY_extraconf} -f "${CONF_FILE}" -p "${PIDFILE}" + "${COMMAND}" ${OCF_RESKEY_extraconf} -f "${CONF_FILE}" -p "${PIDFILE}" if [ $? -ne 0 ]; then ocf_log err "Error. haproxy daemon returned error $?." exit $OCF_ERR_GENERIC diff --git a/files/fuel-ha-utils/ocf/heat_engine_centos b/files/fuel-ha-utils/ocf/heat_engine_centos index 129309a72d..77bac58a99 100644 --- a/files/fuel-ha-utils/ocf/heat_engine_centos +++ b/files/fuel-ha-utils/ocf/heat_engine_centos @@ -37,6 +37,8 @@ OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" OCF_RESKEY_amqp_server_port_default="5673" OCF_RESKEY_user_default="heat" +: ${HA_LOGTAG="ocf-heat_engine"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} diff --git a/files/fuel-ha-utils/ocf/heat_engine_ubuntu b/files/fuel-ha-utils/ocf/heat_engine_ubuntu index 0cbe177417..3a93d3b1bb 100644 --- a/files/fuel-ha-utils/ocf/heat_engine_ubuntu +++ b/files/fuel-ha-utils/ocf/heat_engine_ubuntu @@ -37,6 +37,8 @@ OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" OCF_RESKEY_amqp_server_port_default="5673" OCF_RESKEY_user_default="heat" +: ${HA_LOGTAG="ocf-heat_engine"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} diff --git a/files/fuel-ha-utils/ocf/mysql-wss b/files/fuel-ha-utils/ocf/mysql-wss index 96cbbd3781..49b295aeaa 100644 --- a/files/fuel-ha-utils/ocf/mysql-wss +++ b/files/fuel-ha-utils/ocf/mysql-wss @@ -35,6 +35,8 @@ OCF_RESKEY_test_passwd_default="" OCF_RESKEY_additional_parameters_default="" OCF_RESKEY_master_timeout_default="300" +: ${HA_LOGTAG="ocf-mysql-wss"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} MYSQL_BINDIR="$(dirname ${OCF_RESKEY_binary})" diff --git a/files/fuel-ha-utils/ocf/nova-compute b/files/fuel-ha-utils/ocf/nova-compute index 5b8a729fcd..9677c8a59c 100644 --- a/files/fuel-ha-utils/ocf/nova-compute +++ b/files/fuel-ha-utils/ocf/nova-compute @@ -40,6 +40,8 @@ OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" OCF_RESKEY_amqp_server_port_default="5672" OCF_RESKEY_zeromq_default="false" +: ${HA_LOGTAG="ocf-nova-compute"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} diff --git a/files/fuel-ha-utils/ocf/nova-network b/files/fuel-ha-utils/ocf/nova-network index c31a9e73ea..0a9897b096 100644 --- a/files/fuel-ha-utils/ocf/nova-network +++ b/files/fuel-ha-utils/ocf/nova-network @@ -49,6 +49,8 @@ OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" OCF_RESKEY_amqp_server_port_default="5672" OCF_RESKEY_zeromq_default="false" +: ${HA_LOGTAG="ocf-nova-network"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} diff --git a/files/fuel-ha-utils/ocf/ns_IPaddr2 b/files/fuel-ha-utils/ocf/ns_IPaddr2 index 1fabad5623..92815be9dd 100755 --- a/files/fuel-ha-utils/ocf/ns_IPaddr2 +++ b/files/fuel-ha-utils/ocf/ns_IPaddr2 @@ -19,6 +19,8 @@ OCF_RESKEY_enable_forwarding_default=true OCF_RESKEY_other_networks_default="" OCF_RESKEY_bridge_default="" # can be "", or bridge name +: ${HA_LOGTAG="ocf-ns_IPaddr2"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_cidr_netmask=${OCF_RESKEY_cidr_netmask_default}} : ${OCF_RESKEY_ns=${OCF_RESKEY_ns_default}} : ${OCF_RESKEY_base_veth=${OCF_RESKEY_base_veth_default}} diff --git a/files/fuel-ha-utils/ocf/ns_conntrackd b/files/fuel-ha-utils/ocf/ns_conntrackd index e84f9fcecf..b2a740a95f 100644 --- a/files/fuel-ha-utils/ocf/ns_conntrackd +++ b/files/fuel-ha-utils/ocf/ns_conntrackd @@ -43,6 +43,8 @@ OCF_RESKEY_bridge_default=br-mgmt OCF_RESKEY_host_interface_default=mgmt-conntrd OCF_RESKEY_ns_interface_default=conntrd +: ${HA_LOGTAG="ocf-ns_conntrackd"} +: ${HA_LOGFACILITY="daemon"} # For users of versions prior to 1.2: # Map renamed parameter "conntrackd" to "binary" if in use : ${OCF_RESKEY_binary=${OCF_RESKEY_conntrackd-${OCF_RESKEY_binary_default}}} diff --git a/files/fuel-ha-utils/ocf/ns_dns b/files/fuel-ha-utils/ocf/ns_dns index 34b6c1ce51..d8bfa834bf 100644 --- a/files/fuel-ha-utils/ocf/ns_dns +++ b/files/fuel-ha-utils/ocf/ns_dns @@ -35,6 +35,8 @@ OCF_RESKEY_binpath_default="/usr/sbin/dnsmasq" OCF_RESKEY_extraconf_default="" : ${OCF_ROOT=${OCF_ROOT_default}} +: ${HA_LOGTAG="ocf-ns_dns"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_ns=${OCF_RESKEY_ns_default}} : ${OCF_RESKEY_conffile=${OCF_RESKEY_conffile_default}} diff --git a/files/fuel-ha-utils/ocf/ns_haproxy b/files/fuel-ha-utils/ocf/ns_haproxy index 14e3c4dbcb..e1e4a4aef4 100755 --- a/files/fuel-ha-utils/ocf/ns_haproxy +++ b/files/fuel-ha-utils/ocf/ns_haproxy @@ -51,6 +51,8 @@ OCF_RESKEY_route_metric_default="10000" OCF_RESKEY_debug_default=false : ${OCF_ROOT=${OCF_ROOT_default}} +: ${HA_LOGTAG="ocf-ns_haproxy"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_ns=${OCF_RESKEY_ns_default}} : ${OCF_RESKEY_conffile=${OCF_RESKEY_conffile_default}} @@ -316,7 +318,7 @@ set_ns_routing() { fi # up the ns part - ocf_log debug "Bringing up the namespace interface: ${OCF_RESKEY_namespace_interface}" + ocf_log debug "Bringing up the namespace interface: ${OCF_RESKEY_namespace_interface}" ocf_run nsip link set "${OCF_RESKEY_namespace_interface}" up # set ns part's ip diff --git a/files/fuel-ha-utils/ocf/ns_ntp b/files/fuel-ha-utils/ocf/ns_ntp index de77d8febe..5f5b37a4d3 100644 --- a/files/fuel-ha-utils/ocf/ns_ntp +++ b/files/fuel-ha-utils/ocf/ns_ntp @@ -35,6 +35,8 @@ OCF_RESKEY_binpath_default="/usr/sbin/ntpd" OCF_RESKEY_extraconf_default="" : ${OCF_ROOT=${OCF_ROOT_default}} +: ${HA_LOGTAG="ocf-ns_ntp"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_ns=${OCF_RESKEY_ns_default}} : ${OCF_RESKEY_conffile=${OCF_RESKEY_conffile_default}} diff --git a/files/fuel-ha-utils/ocf/ns_vrouter b/files/fuel-ha-utils/ocf/ns_vrouter index c7a701050c..d0f62a2981 100644 --- a/files/fuel-ha-utils/ocf/ns_vrouter +++ b/files/fuel-ha-utils/ocf/ns_vrouter @@ -40,6 +40,8 @@ OCF_RESKEY_network_mask_default="30" OCF_RESKEY_route_metric_default="10000" : ${OCF_ROOT=${OCF_ROOT_default}} +: ${HA_LOGTAG="ocf-ns_vrouter"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_ns=${OCF_RESKEY_ns_default}} : ${OCF_RESKEY_other_networks=${OCF_RESKEY_other_networks_default}} diff --git a/files/fuel-ha-utils/ocf/ocf-neutron-dhcp-agent b/files/fuel-ha-utils/ocf/ocf-neutron-dhcp-agent index 19fe47caf4..fbb5e4728d 100644 --- a/files/fuel-ha-utils/ocf/ocf-neutron-dhcp-agent +++ b/files/fuel-ha-utils/ocf/ocf-neutron-dhcp-agent @@ -45,7 +45,8 @@ OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" OCF_RESKEY_remove_artifacts_on_stop_start_default='true' OCF_RESKEY_debug_default='false' - +: ${HA_LOGTAG="ocf-neutron-dhcp-agent"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_plugin_config=${OCF_RESKEY_plugin_config_default}} diff --git a/files/fuel-ha-utils/ocf/ocf-neutron-l3-agent b/files/fuel-ha-utils/ocf/ocf-neutron-l3-agent index f92fa034a9..18f5a51443 100644 --- a/files/fuel-ha-utils/ocf/ocf-neutron-l3-agent +++ b/files/fuel-ha-utils/ocf/ocf-neutron-l3-agent @@ -46,6 +46,8 @@ OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" OCF_RESKEY_external_bridge_default="br-ex" OCF_RESKEY_debug_default=false +: ${HA_LOGTAG="ocf-neutron-l3-agent"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_plugin_config=${OCF_RESKEY_plugin_config_default}} diff --git a/files/fuel-ha-utils/ocf/ocf-neutron-metadata-agent b/files/fuel-ha-utils/ocf/ocf-neutron-metadata-agent index 1192622242..6eb7a72f2e 100644 --- a/files/fuel-ha-utils/ocf/ocf-neutron-metadata-agent +++ b/files/fuel-ha-utils/ocf/ocf-neutron-metadata-agent @@ -34,6 +34,8 @@ OCF_RESKEY_user_default="neutron" OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid" OCF_RESKEY_debug_default="false" +: ${HA_LOGTAG="ocf-neutron-metadata-agent"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_agent_config=${OCF_RESKEY_agent_config_default}} diff --git a/files/fuel-ha-utils/ocf/ocf-neutron-ovs-agent b/files/fuel-ha-utils/ocf/ocf-neutron-ovs-agent index c6b4719bf5..8a6a38831e 100644 --- a/files/fuel-ha-utils/ocf/ocf-neutron-ovs-agent +++ b/files/fuel-ha-utils/ocf/ocf-neutron-ovs-agent @@ -40,6 +40,8 @@ OCF_RESKEY_segmentation_bridge_default="br-tun" OCF_RESKEY_log_file_default="/var/log/neutron/openvswitch-agent.log" OCF_RESKEY_debug_default='false' +: ${HA_LOGTAG="ocf-neutron-ovs-agent"} +: ${HA_LOGFACILITY="daemon"} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_plugin_config=${OCF_RESKEY_plugin_config_default}}