From aed78804ef9c87931d61a8036bcfa229704ae0e6 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Fri, 17 Oct 2014 16:44:31 -0400 Subject: Add Ceilometer service support Implements: blueprint kube-ceilometer-container Change-Id: Ic9be6f2fb57641aa77f7f3a31481b166adad3f36 --- docker/ceilometer/ceilometer-alarm/Dockerfile | 7 +++ docker/ceilometer/ceilometer-alarm/build | 1 + docker/ceilometer/ceilometer-alarm/start.sh | 10 ++++ docker/ceilometer/ceilometer-api/Dockerfile | 9 +++ docker/ceilometer/ceilometer-api/build | 1 + docker/ceilometer/ceilometer-api/start.sh | 46 +++++++++++++++ docker/ceilometer/ceilometer-base/Dockerfile | 5 ++ docker/ceilometer/ceilometer-base/build | 1 + .../ceilometer-base/config-ceilometer.sh | 69 ++++++++++++++++++++++ docker/ceilometer/ceilometer-central/Dockerfile | 7 +++ docker/ceilometer/ceilometer-central/build | 1 + docker/ceilometer/ceilometer-central/start.sh | 14 +++++ docker/ceilometer/ceilometer-collector/Dockerfile | 7 +++ docker/ceilometer/ceilometer-collector/build | 1 + docker/ceilometer/ceilometer-collector/start.sh | 9 +++ docker/ceilometer/ceilometer-compute/Dockerfile | 8 +++ docker/ceilometer/ceilometer-compute/build | 1 + docker/ceilometer/ceilometer-compute/start.sh | 25 ++++++++ .../ceilometer/ceilometer-notification/Dockerfile | 7 +++ docker/ceilometer/ceilometer-notification/build | 1 + docker/ceilometer/ceilometer-notification/start.sh | 9 +++ 21 files changed, 239 insertions(+) create mode 100644 docker/ceilometer/ceilometer-alarm/Dockerfile create mode 120000 docker/ceilometer/ceilometer-alarm/build create mode 100644 docker/ceilometer/ceilometer-alarm/start.sh create mode 100644 docker/ceilometer/ceilometer-api/Dockerfile create mode 120000 docker/ceilometer/ceilometer-api/build create mode 100644 docker/ceilometer/ceilometer-api/start.sh create mode 100644 docker/ceilometer/ceilometer-base/Dockerfile create mode 120000 docker/ceilometer/ceilometer-base/build create mode 100644 docker/ceilometer/ceilometer-base/config-ceilometer.sh create mode 100644 docker/ceilometer/ceilometer-central/Dockerfile create mode 120000 docker/ceilometer/ceilometer-central/build create mode 100644 docker/ceilometer/ceilometer-central/start.sh create mode 100644 docker/ceilometer/ceilometer-collector/Dockerfile create mode 120000 docker/ceilometer/ceilometer-collector/build create mode 100644 docker/ceilometer/ceilometer-collector/start.sh create mode 100644 docker/ceilometer/ceilometer-compute/Dockerfile create mode 120000 docker/ceilometer/ceilometer-compute/build create mode 100644 docker/ceilometer/ceilometer-compute/start.sh create mode 100644 docker/ceilometer/ceilometer-notification/Dockerfile create mode 120000 docker/ceilometer/ceilometer-notification/build create mode 100644 docker/ceilometer/ceilometer-notification/start.sh (limited to 'docker') diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile b/docker/ceilometer/ceilometer-alarm/Dockerfile new file mode 100644 index 000000000..7bcbf30ae --- /dev/null +++ b/docker/ceilometer/ceilometer-alarm/Dockerfile @@ -0,0 +1,7 @@ +FROM kollaglue/fedora-rdo-ceilometer-base +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN yum install -y openstack-ceilometer-alarm && yum clean all + +ADD ./start.sh /start.sh +CMD ["/start.sh"] diff --git a/docker/ceilometer/ceilometer-alarm/build b/docker/ceilometer/ceilometer-alarm/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/ceilometer/ceilometer-alarm/build @@ -0,0 +1 @@ +../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-alarm/start.sh b/docker/ceilometer/ceilometer-alarm/start.sh new file mode 100644 index 000000000..2096348c4 --- /dev/null +++ b/docker/ceilometer/ceilometer-alarm/start.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +. /opt/kolla/kolla-common.sh +. /opt/kolla/config-ceilometer.sh + + +exec /usr/bin/ceilometer-alarm-evaluator & +exec /usr/bin/ceilometer-alarm-notifier diff --git a/docker/ceilometer/ceilometer-api/Dockerfile b/docker/ceilometer/ceilometer-api/Dockerfile new file mode 100644 index 000000000..29a46b39f --- /dev/null +++ b/docker/ceilometer/ceilometer-api/Dockerfile @@ -0,0 +1,9 @@ +FROM kollaglue/fedora-rdo-ceilometer-base +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN yum install -y openstack-ceilometer-api && yum clean all + +EXPOSE 8777 + +ADD ./start.sh /start.sh +CMD ["/start.sh"] diff --git a/docker/ceilometer/ceilometer-api/build b/docker/ceilometer/ceilometer-api/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/ceilometer/ceilometer-api/build @@ -0,0 +1 @@ +../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-api/start.sh b/docker/ceilometer/ceilometer-api/start.sh new file mode 100644 index 000000000..8c9acef5f --- /dev/null +++ b/docker/ceilometer/ceilometer-api/start.sh @@ -0,0 +1,46 @@ +#!/bin/sh + +set -e + +. /opt/kolla/kolla-common.sh +. /opt/kolla/config-ceilometer.sh + +check_required_vars CEILOMETER_DB_USER CEILOMETER_DB_NAME KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER CEILOMETER_ADMIN_PASSWORD ADMIN_TENANT_NAME METERING_SECRET CEILOMETER_API_SERVICE_HOST PUBLIC_IP + +check_for_keystone +check_for_db + +#TODO(pkilambi): Add mongodb support + +mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql < /openrc < + +RUN yum install -y openstack-ceilometer-collector && yum clean all + +ADD ./start.sh /start.sh +CMD ["/start.sh"] diff --git a/docker/ceilometer/ceilometer-collector/build b/docker/ceilometer/ceilometer-collector/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/ceilometer/ceilometer-collector/build @@ -0,0 +1 @@ +../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-collector/start.sh b/docker/ceilometer/ceilometer-collector/start.sh new file mode 100644 index 000000000..21de9d315 --- /dev/null +++ b/docker/ceilometer/ceilometer-collector/start.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +. /opt/kolla/kolla-common.sh +. /opt/kolla/config-ceilometer.sh + + +exec /usr/bin/ceilometer-collector diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile b/docker/ceilometer/ceilometer-compute/Dockerfile new file mode 100644 index 000000000..07b38bcc5 --- /dev/null +++ b/docker/ceilometer/ceilometer-compute/Dockerfile @@ -0,0 +1,8 @@ +FROM kollaglue/fedora-rdo-ceilometer-base +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \ + && yum clean all + +ADD ./start.sh /start.sh +CMD ["/start.sh"] diff --git a/docker/ceilometer/ceilometer-compute/build b/docker/ceilometer/ceilometer-compute/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/ceilometer/ceilometer-compute/build @@ -0,0 +1 @@ +../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh new file mode 100644 index 000000000..3e3c6c82a --- /dev/null +++ b/docker/ceilometer/ceilometer-compute/start.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +. /opt/kolla/kolla-common.sh +. /opt/kolla/config-ceilometer.sh + + +check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_SERVICE_HOST KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER ADMIN_TENANT_NAME + +check_for_keystone + +# Nova conf settings +crudini --set /etc/nova/nova.conf DEFAULT instance_usage_audit True +crudini --set /etc/nova/nova.conf DEFAULT instance_usage_audit_period hour +crudini --set /etc/nova/nova.conf DEFAULT notify_on_state_change vm_and_task_state +crudini --set /etc/nova/nova.conf DEFAULT notification_driver nova.openstack.common.notifier.rpc_notifier +crudini --set /etc/nova/nova.conf DEFAULT notification_driver ceilometer.compute.nova_notifier + +#ceilometer settings +cfg=/etc/ceilometer/ceilometer.conf +crudini --set $cfg publisher_rpc metering_secret ${KEYSTONE_ADMIN_TOKEN} +crudini --set $cfg rabbit_host ${KEYSTONE_SERVICE_HOST} +crudini --set $cfg rabbit_password ${RABBITMQ_PASS} + + +exec /usr/bin/ceilometer-agent-compute diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile b/docker/ceilometer/ceilometer-notification/Dockerfile new file mode 100644 index 000000000..385a27248 --- /dev/null +++ b/docker/ceilometer/ceilometer-notification/Dockerfile @@ -0,0 +1,7 @@ +FROM kollaglue/fedora-rdo-ceilometer-base +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN yum install -y openstack-ceilometer-notification && yum clean all + +ADD ./start.sh /start.sh +CMD ["/start.sh"] diff --git a/docker/ceilometer/ceilometer-notification/build b/docker/ceilometer/ceilometer-notification/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/ceilometer/ceilometer-notification/build @@ -0,0 +1 @@ +../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-notification/start.sh b/docker/ceilometer/ceilometer-notification/start.sh new file mode 100644 index 000000000..f2f84789e --- /dev/null +++ b/docker/ceilometer/ceilometer-notification/start.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +. /opt/kolla/kolla-common.sh +. /opt/kolla/config-ceilometer.sh + + +exec /usr/bin/ceilometer-agent-notification -- cgit v1.2.3