Use a single configuration file for specifying docker containers.

This removes the default container names from all the templates
and uses a single environment file to specify the full container
name and registry from which to pull.  Also does away with most
of DockerNamespace.

Change-Id: Ieaedac33f0a25a352ab432cdb00b5c888be4ba27
Depends-On: Ibc108871ebc2beb1baae437105b2da1d0123ba60
Co-Authored-By: Dan Prince <dprince@redhat.com>
Co-Authored-By: Steve Baker <sbaker@redhat.com>
This commit is contained in:
Ian Main
2017-07-12 11:41:57 +12:00
committed by Steve Baker
parent d1fcf403dc
commit e76d84f784
78 changed files with 275 additions and 1196 deletions

View File

@@ -4,17 +4,11 @@ description: >
OpenStack containerized Ceilometer Agent Central service
parameters:
DockerNamespace:
description: namespace
default: 'tripleoupstream'
type: string
DockerCeilometerCentralImage:
description: image
default: 'centos-binary-ceilometer-central:latest'
type: string
DockerCeilometerConfigImage:
description: The container image to use for the ceilometer config_volume
default: 'centos-binary-ceilometer-central:latest'
type: string
EndpointMap:
default: {}
@@ -67,10 +61,7 @@ outputs:
config_volume: ceilometer
puppet_tags: ceilometer_config
step_config: *step_config
config_image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
config_image: {get_param: DockerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_central.json:
command: /usr/bin/ceilometer-polling --polling-namespaces central
@@ -83,10 +74,7 @@ outputs:
step_3:
ceilometer_init_log:
start_order: 0
image: &ceilometer_agent_central_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerCentralImage} ]
image: &ceilometer_agent_central_image {get_param: DockerCeilometerCentralImage}
user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
volumes: