From d28848b26588d606612ac62551c037e0a2b87244 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Sun, 16 Nov 2014 21:21:47 -0500 Subject: [PATCH] Add package support to ceilometer-alarm-evaluator Updates the ceilometer-alarm-evaluator so that it supports using distro packages via pkg-map and package-installs. The default distro package is set to openstack-ceilometer-alarm which on RHEL/Fedora contains the ceilometer-alarm-evaluator binary. Also, includes the related svc-map configs so that the packaged version of the systemd scripts work correctly. Change-Id: Ie7c68ddd6d17de4b48b7ef9eb692ee650e38c601 --- elements/ceilometer-alarm-evaluator/element-deps | 2 ++ .../package-installs-ceilometer-alarm-evaluator | 1 + .../post-configure.d/69-ceilometer-alarm-evaluator | 4 ++-- elements/ceilometer-alarm-evaluator/pkg-map | 5 +++++ elements/ceilometer-alarm-evaluator/svc-map | 3 +++ 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 elements/ceilometer-alarm-evaluator/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-evaluator create mode 100644 elements/ceilometer-alarm-evaluator/pkg-map create mode 100644 elements/ceilometer-alarm-evaluator/svc-map diff --git a/elements/ceilometer-alarm-evaluator/element-deps b/elements/ceilometer-alarm-evaluator/element-deps index 381bdfbc9..0ca3672d0 100644 --- a/elements/ceilometer-alarm-evaluator/element-deps +++ b/elements/ceilometer-alarm-evaluator/element-deps @@ -1,3 +1,5 @@ ceilometer os-refresh-config os-svc-install +package-installs +pkg-map diff --git a/elements/ceilometer-alarm-evaluator/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-evaluator b/elements/ceilometer-alarm-evaluator/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-evaluator new file mode 100644 index 000000000..c6aa5c982 --- /dev/null +++ b/elements/ceilometer-alarm-evaluator/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-evaluator @@ -0,0 +1 @@ +ceilometer_alarm_package diff --git a/elements/ceilometer-alarm-evaluator/os-refresh-config/post-configure.d/69-ceilometer-alarm-evaluator b/elements/ceilometer-alarm-evaluator/os-refresh-config/post-configure.d/69-ceilometer-alarm-evaluator index 9095f744f..2551e7f33 100755 --- a/elements/ceilometer-alarm-evaluator/os-refresh-config/post-configure.d/69-ceilometer-alarm-evaluator +++ b/elements/ceilometer-alarm-evaluator/os-refresh-config/post-configure.d/69-ceilometer-alarm-evaluator @@ -1,6 +1,6 @@ #!/bin/bash set -eux -os-svc-enable -n ceilometer-alarm-evaluator +os-svc-enable -an ceilometer-alarm-evaluator -os-svc-restart -n ceilometer-alarm-evaluator +os-svc-restart -an ceilometer-alarm-evaluator diff --git a/elements/ceilometer-alarm-evaluator/pkg-map b/elements/ceilometer-alarm-evaluator/pkg-map new file mode 100644 index 000000000..2fc9f37bd --- /dev/null +++ b/elements/ceilometer-alarm-evaluator/pkg-map @@ -0,0 +1,5 @@ +{ + "default": { + "ceilometer_alarm_package": "openstack-ceilometer-alarm" + } +} diff --git a/elements/ceilometer-alarm-evaluator/svc-map b/elements/ceilometer-alarm-evaluator/svc-map new file mode 100644 index 000000000..7260a7bcf --- /dev/null +++ b/elements/ceilometer-alarm-evaluator/svc-map @@ -0,0 +1,3 @@ +ceilometer-alarm-evaluator: + default: ceilometer-alarm-evaluator + redhat: openstack-ceilometer-alarm-evaluator