151 lines
6.6 KiB
Diff
151 lines
6.6 KiB
Diff
Index: git/ocf/ceilometer-agent-central
|
|
===================================================================
|
|
--- git.orig/ocf/ceilometer-agent-central
|
|
+++ git/ocf/ceilometer-agent-central
|
|
@@ -23,6 +23,7 @@
|
|
# OCF instance parameters:
|
|
# OCF_RESKEY_binary
|
|
# OCF_RESKEY_config
|
|
+# OCF_RESKEY_pipeline
|
|
# OCF_RESKEY_user
|
|
# OCF_RESKEY_pid
|
|
# OCF_RESKEY_monitor_binary
|
|
@@ -40,12 +41,14 @@
|
|
|
|
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_user_default="root"
|
|
OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid"
|
|
OCF_RESKEY_amqp_server_port_default="5672"
|
|
|
|
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
|
|
: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
|
|
+: ${OCF_RESKEY_pipeline=${OCF_RESKEY_pipeline_default}}
|
|
: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
|
|
: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
|
|
: ${OCF_RESKEY_amqp_server_port=${OCF_RESKEY_amqp_server_port_default}}
|
|
@@ -99,6 +102,14 @@ Location of the OpenStack Ceilometer Cen
|
|
<content type="string" default="${OCF_RESKEY_config_default}" />
|
|
</parameter>
|
|
|
|
+<parameter name="pipeline" unique="0" required="0">
|
|
+<longdesc lang="en">
|
|
+Location of the OpenStack Ceilometer Central Agent Service (ceilometer-agent-central) pipeline file
|
|
+</longdesc>
|
|
+<shortdesc lang="en">OpenStack Ceilometer Central Agent (ceilometer-agent-central registry) pipeline file</shortdesc>
|
|
+<content type="string" default="${OCF_RESKEY_pipeline_default}" />
|
|
+</parameter>
|
|
+
|
|
<parameter name="user" unique="0" required="0">
|
|
<longdesc lang="en">
|
|
User running OpenStack Ceilometer Central Agent Service (ceilometer-agent-central)
|
|
@@ -247,6 +258,7 @@ ceilometer_agent_central_start() {
|
|
# run the actual ceilometer-agent-central daemon. Don't use ocf_run as we're sending the tool's output
|
|
# straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
|
|
su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
|
|
+ --pipeline_cfg_file=$OCF_RESKEY_pipeline \
|
|
$OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
|
|
|
|
# Spin waiting for the server to come up.
|
|
Index: git/ocf/ceilometer-agent-notification
|
|
===================================================================
|
|
--- git.orig/ocf/ceilometer-agent-notification
|
|
+++ git/ocf/ceilometer-agent-notification
|
|
@@ -23,6 +23,7 @@
|
|
# OCF instance parameters:
|
|
# OCF_RESKEY_binary
|
|
# OCF_RESKEY_config
|
|
+# OCF_RESKEY_pipeline
|
|
# OCF_RESKEY_user
|
|
# OCF_RESKEY_pid
|
|
# OCF_RESKEY_monitor_binary
|
|
@@ -40,12 +41,14 @@
|
|
|
|
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_user_default="root"
|
|
OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid"
|
|
OCF_RESKEY_amqp_server_port_default="5672"
|
|
|
|
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
|
|
: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
|
|
+: ${OCF_RESKEY_pipeline=${OCF_RESKEY_pipeline_default}}
|
|
: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
|
|
: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
|
|
: ${OCF_RESKEY_amqp_server_port=${OCF_RESKEY_amqp_server_port_default}}
|
|
@@ -99,6 +102,14 @@ Location of the OpenStack Ceilometer Cen
|
|
<content type="string" default="${OCF_RESKEY_config_default}" />
|
|
</parameter>
|
|
|
|
+<parameter name="pipeline" unique="0" required="0">
|
|
+<longdesc lang="en">
|
|
+Location of the OpenStack Ceilometer Central Agent Service (ceilometer-agent-notification) pipeline file
|
|
+</longdesc>
|
|
+<shortdesc lang="en">OpenStack Ceilometer Central Agent (ceilometer-agent-notification registry) pipeline file</shortdesc>
|
|
+<content type="string" default="${OCF_RESKEY_pipeline_default}" />
|
|
+</parameter>
|
|
+
|
|
<parameter name="user" unique="0" required="0">
|
|
<longdesc lang="en">
|
|
User running OpenStack Ceilometer Central Agent Service (ceilometer-agent-notification)
|
|
@@ -247,6 +258,7 @@ ceilometer_agent_notification_start() {
|
|
# run the actual ceilometer-agent-notification daemon. Don't use ocf_run as we're sending the tool's output
|
|
# straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
|
|
su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
|
|
+ --pipeline_cfg_file=$OCF_RESKEY_pipeline \
|
|
$OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
|
|
|
|
# Spin waiting for the server to come up.
|
|
Index: git/ocf/ceilometer-api
|
|
===================================================================
|
|
--- git.orig/ocf/ceilometer-api
|
|
+++ git/ocf/ceilometer-api
|
|
@@ -23,6 +23,7 @@
|
|
# OCF instance parameters:
|
|
# OCF_RESKEY_binary
|
|
# OCF_RESKEY_config
|
|
+# OCF_RESKEY_pipeline
|
|
# OCF_RESKEY_user
|
|
# OCF_RESKEY_pid
|
|
# OCF_RESKEY_monitor_binary
|
|
@@ -40,12 +41,14 @@
|
|
|
|
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_user_default="root"
|
|
OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid"
|
|
OCF_RESKEY_api_listen_port_default="8777"
|
|
|
|
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
|
|
: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
|
|
+: ${OCF_RESKEY_pipeline=${OCF_RESKEY_pipeline_default}}
|
|
: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
|
|
: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
|
|
: ${OCF_RESKEY_api_listen_port=${OCF_RESKEY_api_listen_port_default}}
|
|
@@ -99,6 +102,14 @@ Location of the OpenStack Ceilometer API
|
|
<content type="string" default="${OCF_RESKEY_config_default}" />
|
|
</parameter>
|
|
|
|
+<parameter name="pipeline" unique="0" required="0">
|
|
+<longdesc lang="en">
|
|
+Location of the OpenStack Ceilometer API Service (ceilometer-api) pipeline file
|
|
+</longdesc>
|
|
+<shortdesc lang="en">OpenStack Ceilometer API (ceilometer-api registry) pipeline file</shortdesc>
|
|
+<content type="string" default="${OCF_RESKEY_pipeline_default}" />
|
|
+</parameter>
|
|
+
|
|
<parameter name="user" unique="0" required="0">
|
|
<longdesc lang="en">
|
|
User running OpenStack Ceilometer API Service (ceilometer-api)
|
|
@@ -257,6 +268,7 @@ ceilometer_api_start() {
|
|
# run the actual ceilometer-api daemon. Don't use ocf_run as we're sending the tool's output
|
|
# straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
|
|
su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
|
|
+ --pipeline_cfg_file=$OCF_RESKEY_pipeline \
|
|
$OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
|
|
|
|
# Spin waiting for the server to come up.
|