64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
Index: git/ocf/ceilometer-agent-central
|
|
===================================================================
|
|
--- git.orig/ocf/ceilometer-agent-central
|
|
+++ git/ocf/ceilometer-agent-central
|
|
@@ -34,6 +34,7 @@
|
|
|
|
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
|
|
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
|
|
+. /usr/bin/tsconfig
|
|
|
|
#######################################################################
|
|
|
|
@@ -41,7 +42,7 @@
|
|
|
|
OCF_RESKEY_binary_default="ceilometer-agent-central"
|
|
OCF_RESKEY_config_default="/etc/ceilometer/ceilometer.conf"
|
|
-OCF_RESKEY_pipeline_default="/opt/cgcs/ceilometer/pipeline.yaml"
|
|
+OCF_RESKEY_pipeline_default="/opt/cgcs/ceilometer/${SW_VERSION}/pipeline.yaml"
|
|
OCF_RESKEY_user_default="root"
|
|
OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid"
|
|
OCF_RESKEY_amqp_server_port_default="5672"
|
|
Index: git/ocf/ceilometer-agent-notification
|
|
===================================================================
|
|
--- git.orig/ocf/ceilometer-agent-notification
|
|
+++ git/ocf/ceilometer-agent-notification
|
|
@@ -34,6 +34,7 @@
|
|
|
|
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
|
|
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
|
|
+. /usr/bin/tsconfig
|
|
|
|
#######################################################################
|
|
|
|
@@ -41,7 +42,7 @@
|
|
|
|
OCF_RESKEY_binary_default="ceilometer-agent-notification"
|
|
OCF_RESKEY_config_default="/etc/ceilometer/ceilometer.conf"
|
|
-OCF_RESKEY_pipeline_default="/opt/cgcs/ceilometer/pipeline.yaml"
|
|
+OCF_RESKEY_pipeline_default="/opt/cgcs/ceilometer/${SW_VERSION}/pipeline.yaml"
|
|
OCF_RESKEY_user_default="root"
|
|
OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid"
|
|
OCF_RESKEY_amqp_server_port_default="5672"
|
|
Index: git/ocf/ceilometer-api
|
|
===================================================================
|
|
--- git.orig/ocf/ceilometer-api
|
|
+++ git/ocf/ceilometer-api
|
|
@@ -34,6 +34,7 @@
|
|
|
|
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
|
|
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
|
|
+. /usr/bin/tsconfig
|
|
|
|
#######################################################################
|
|
|
|
@@ -41,7 +42,7 @@
|
|
|
|
OCF_RESKEY_binary_default="ceilometer-api"
|
|
OCF_RESKEY_config_default="/etc/ceilometer/ceilometer.conf"
|
|
-OCF_RESKEY_pipeline_default="/opt/cgcs/ceilometer/pipeline.yaml"
|
|
+OCF_RESKEY_pipeline_default="/opt/cgcs/ceilometer/${SW_VERSION}/pipeline.yaml"
|
|
OCF_RESKEY_user_default="root"
|
|
OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid"
|
|
OCF_RESKEY_api_listen_port_default="8777"
|