diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2015-06-17 11:14:59 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2015-06-19 17:12:05 +0000 |
| commit | 897337cdd61f1702aa7e68da0466804bf0d21a86 (patch) | |
| tree | d8489ef0f286ff69f10ebe0b42eca6cf8b1cc123 /docker/centos/binary/ceilometer/ceilometer-compute | |
| parent | c2b05b576f45ddf432571f817be45e6bcb188f75 (diff) | |
| download | kolla-897337cdd61f1702aa7e68da0466804bf0d21a86.tar.gz kolla-897337cdd61f1702aa7e68da0466804bf0d21a86.zip | |
Symlink all non Dockerfile resources in images
The only files in the docker image directories that differ majorly between
distros are the Dockerfiles (e.g. different package manager mechanisms,
different repo sources, etc).
The supporting files such as the start.sh/check.sh and config files should
largely stay the same between base images.
This change moves these files up into a "common" directory, and symlinks them
in the same way that the build script is managed. This means when adding a new
base distro only new Dockerfiles need to be created. Also, if a distro does
happen to require a vastly different start.sh script for example, one can
choose to simply not symlink to the common and instead drop in a custom one.
Implements: blueprint refactor-base-image-layout
Change-Id: Ic4db69d31ff54a1fb95af4853a2e5ae490064284
Diffstat (limited to 'docker/centos/binary/ceilometer/ceilometer-compute')
| l---------[-rw-r--r--] | docker/centos/binary/ceilometer/ceilometer-compute/start.sh | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/start.sh b/docker/centos/binary/ceilometer/ceilometer-compute/start.sh index f4fc30bae..1118b9552 100644..120000 --- a/docker/centos/binary/ceilometer/ceilometer-compute/start.sh +++ b/docker/centos/binary/ceilometer/ceilometer-compute/start.sh @@ -1,25 +1 @@ -#!/bin/bash - -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-ceilometer.sh - - -check_required_vars KEYSTONE_ADMIN_TOKEN RABBITMQ_SERVICE_HOST RABBIT_PASSWORD - -fail_unless_os_service_running 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 ${RABBITMQ_SERVICE_HOST} -crudini --set $cfg rabbit_password ${RABBIT_PASSWORD} - - -exec /usr/bin/ceilometer-agent-compute +../../../../common/ceilometer/ceilometer-compute/start.sh
\ No newline at end of file |
