Merge "Add heat parameter for all of config_volume images"

This commit is contained in:
Jenkins 2017-06-29 20:12:59 +00:00 committed by Gerrit Code Review
commit e8d8eae59c
79 changed files with 532 additions and 216 deletions

View File

@ -4,6 +4,7 @@ parameters:
DockerNamespace: DockerNamespace:
type: string type: string
default: tripleoupstream default: tripleoupstream
description: namespace
DockerNamespaceIsRegistry: DockerNamespaceIsRegistry:
type: boolean type: boolean
default: false default: false

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-aodh-api:latest' default: 'centos-binary-aodh-api:latest'
type: string type: string
DockerAodhConfigImage:
description: The container image to use for the aodh config_volume
default: 'centos-binary-aodh-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -73,10 +77,10 @@ outputs:
config_volume: aodh config_volume: aodh
puppet_tags: aodh_api_paste_ini,aodh_config puppet_tags: aodh_api_paste_ini,aodh_config
step_config: *step_config step_config: *step_config
config_image: &aodh_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerAodhApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/aodh_api.json: /var/lib/kolla/config_files/aodh_api.json:
command: /usr/sbin/httpd -DFOREGROUND command: /usr/sbin/httpd -DFOREGROUND
@ -88,14 +92,17 @@ outputs:
# db sync runs before permissions set by kolla_config # db sync runs before permissions set by kolla_config
step_2: step_2:
aodh_init_log: aodh_init_log:
image: *aodh_image image: &aodh_api_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerAodhApiImage} ]
user: root user: root
volumes: volumes:
- /var/log/containers/aodh:/var/log/aodh - /var/log/containers/aodh:/var/log/aodh
command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R aodh:aodh /var/log/aodh'] command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R aodh:aodh /var/log/aodh']
step_3: step_3:
aodh_db_sync: aodh_db_sync:
image: *aodh_image image: *aodh_api_image
net: host net: host
privileged: false privileged: false
detach: false detach: false
@ -109,7 +116,7 @@ outputs:
command: "/usr/bin/bootstrap_host_exec aodh_api su aodh -s /bin/bash -c /usr/bin/aodh-dbsync" command: "/usr/bin/bootstrap_host_exec aodh_api su aodh -s /bin/bash -c /usr/bin/aodh-dbsync"
step_4: step_4:
aodh_api: aodh_api:
image: *aodh_image image: *aodh_api_image
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-aodh-evaluator:latest' default: 'centos-binary-aodh-evaluator:latest'
type: string type: string
DockerAodhConfigImage:
description: The container image to use for the aodh config_volume
default: 'centos-binary-aodh-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -65,10 +69,10 @@ outputs:
config_volume: aodh config_volume: aodh
puppet_tags: aodh_config puppet_tags: aodh_config
step_config: *step_config step_config: *step_config
config_image: &aodh_evaluator_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerAodhEvaluatorImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/aodh_evaluator.json: /var/lib/kolla/config_files/aodh_evaluator.json:
command: /usr/bin/aodh-evaluator command: /usr/bin/aodh-evaluator
@ -79,7 +83,10 @@ outputs:
docker_config: docker_config:
step_4: step_4:
aodh_evaluator: aodh_evaluator:
image: *aodh_evaluator_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerAodhEvaluatorImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-aodh-listener:latest' default: 'centos-binary-aodh-listener:latest'
type: string type: string
DockerAodhConfigImage:
description: The container image to use for the aodh config_volume
default: 'centos-binary-aodh-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -65,10 +69,10 @@ outputs:
config_volume: aodh config_volume: aodh
puppet_tags: aodh_config puppet_tags: aodh_config
step_config: *step_config step_config: *step_config
config_image: &aodh_listener_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerAodhListenerImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/aodh_listener.json: /var/lib/kolla/config_files/aodh_listener.json:
command: /usr/bin/aodh-listener command: /usr/bin/aodh-listener
@ -79,7 +83,10 @@ outputs:
docker_config: docker_config:
step_4: step_4:
aodh_listener: aodh_listener:
image: *aodh_listener_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerAodhListenerImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-aodh-notifier:latest' default: 'centos-binary-aodh-notifier:latest'
type: string type: string
DockerAodhConfigImage:
description: The container image to use for the aodh config_volume
default: 'centos-binary-aodh-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -65,10 +69,10 @@ outputs:
config_volume: aodh config_volume: aodh
puppet_tags: aodh_config puppet_tags: aodh_config
step_config: *step_config step_config: *step_config
config_image: &aodh_notifier_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerAodhNotifierImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/aodh_notifier.json: /var/lib/kolla/config_files/aodh_notifier.json:
command: /usr/bin/aodh-notifier command: /usr/bin/aodh-notifier
@ -79,7 +83,10 @@ outputs:
docker_config: docker_config:
step_4: step_4:
aodh_notifier: aodh_notifier:
image: *aodh_notifier_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerAodhNotifierImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-ceilometer-central:latest' default: 'centos-binary-ceilometer-central:latest'
type: string type: string
DockerCeilometerConfigImage:
description: The container image to use for the ceilometer config_volume
default: 'centos-binary-ceilometer-central:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,10 +67,10 @@ outputs:
config_volume: ceilometer config_volume: ceilometer
puppet_tags: ceilometer_config puppet_tags: ceilometer_config
step_config: *step_config step_config: *step_config
config_image: &ceilometer_agent_central_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerCentralImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_central.json: /var/lib/kolla/config_files/ceilometer_agent_central.json:
command: /usr/bin/ceilometer-polling --polling-namespaces central command: /usr/bin/ceilometer-polling --polling-namespaces central
@ -74,7 +78,10 @@ outputs:
step_3: step_3:
ceilometer_init_log: ceilometer_init_log:
start_order: 0 start_order: 0
image: *ceilometer_agent_central_image image: &ceilometer_agent_central_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerCentralImage} ]
user: root user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer'] command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
volumes: volumes:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-ceilometer-compute:latest' default: 'centos-binary-ceilometer-compute:latest'
type: string type: string
DockerCeilometerConfigImage:
description: The container image to use for the ceilometer config_volume
default: 'centos-binary-ceilometer-central:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,17 +67,20 @@ outputs:
config_volume: ceilometer config_volume: ceilometer
puppet_tags: ceilometer_config puppet_tags: ceilometer_config
step_config: *step_config step_config: *step_config
config_image: &ceilometer_agent_compute_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerComputeImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_compute.json: /var/lib/kolla/config_files/ceilometer_agent_compute.json:
command: /usr/bin/ceilometer-polling --polling-namespaces compute command: /usr/bin/ceilometer-polling --polling-namespaces compute
docker_config: docker_config:
step_4: step_4:
ceilometer_agent_compute: ceilometer_agent_compute:
image: *ceilometer_agent_compute_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerComputeImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-ceilometer-ipmi:latest' default: 'centos-binary-ceilometer-ipmi:latest'
type: string type: string
DockerCeilometerConfigImage:
description: The container image to use for the ceilometer config_volume
default: 'centos-binary-ceilometer-central:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,10 +67,10 @@ outputs:
config_volume: ceilometer config_volume: ceilometer
puppet_tags: ceilometer_config puppet_tags: ceilometer_config
step_config: *step_config step_config: *step_config
config_image: &ceilometer_agent_ipmi_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerIpmiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/ceilometer-agent-ipmi.json: /var/lib/kolla/config_files/ceilometer-agent-ipmi.json:
command: /usr/bin/ceilometer-polling --polling-namespaces ipmi command: /usr/bin/ceilometer-polling --polling-namespaces ipmi
@ -74,7 +78,10 @@ outputs:
step_3: step_3:
ceilometer_init_log: ceilometer_init_log:
start_order: 0 start_order: 0
image: *ceilometer_agent_ipmi_image image: &ceilometer_agent_ipmi_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerIpmiImage} ]
user: root user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer'] command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
volumes: volumes:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-ceilometer-notification:latest' default: 'centos-binary-ceilometer-notification:latest'
type: string type: string
DockerCeilometerConfigImage:
description: The container image to use for the ceilometer config_volume
default: 'centos-binary-ceilometer-central:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,10 +67,10 @@ outputs:
config_volume: ceilometer config_volume: ceilometer
puppet_tags: ceilometer_config puppet_tags: ceilometer_config
step_config: *step_config step_config: *step_config
config_image: &ceilometer_agent_notification_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerNotificationImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_notification.json: /var/lib/kolla/config_files/ceilometer_agent_notification.json:
command: /usr/bin/ceilometer-agent-notification command: /usr/bin/ceilometer-agent-notification
@ -74,7 +78,10 @@ outputs:
step_3: step_3:
ceilometer_init_log: ceilometer_init_log:
start_order: 0 start_order: 0
image: *ceilometer_agent_notification_image image: &ceilometer_agent_notification_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerNotificationImage} ]
user: root user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer'] command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
volumes: volumes:

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-cinder-api:latest' default: 'centos-binary-cinder-api:latest'
type: string type: string
# we configure all cinder services in the same cinder base container
DockerCinderConfigImage: DockerCinderConfigImage:
description: image description: The container image to use for the cinder config_volume
default: 'centos-binary-cinder-api:latest' default: 'centos-binary-cinder-api:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-cinder-backup:latest' default: 'centos-binary-cinder-backup:latest'
type: string type: string
# we configure all cinder services in the same cinder base container
DockerCinderConfigImage: DockerCinderConfigImage:
description: image description: The container image to use for the cinder config_volume
default: 'centos-binary-cinder-api:latest' default: 'centos-binary-cinder-api:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-cinder-scheduler:latest' default: 'centos-binary-cinder-scheduler:latest'
type: string type: string
# we configure all cinder services in the same cinder base container
DockerCinderConfigImage: DockerCinderConfigImage:
description: image description: The container image to use for the cinder config_volume
default: 'centos-binary-cinder-api:latest' default: 'centos-binary-cinder-api:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-cinder-volume:latest' default: 'centos-binary-cinder-volume:latest'
type: string type: string
# we configure all cinder services in the same cinder base container
DockerCinderConfigImage: DockerCinderConfigImage:
description: image description: The container image to use for the cinder config_volume
default: 'centos-binary-cinder-api:latest' default: 'centos-binary-cinder-api:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-collectd:latest' default: 'centos-binary-collectd:latest'
type: string type: string
DockerCollectdConfigImage:
description: The container image to use for the collectd config_volume
default: 'centos-binary-collectd:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -68,10 +72,10 @@ outputs:
config_volume: collectd config_volume: collectd
puppet_tags: collectd_client_config puppet_tags: collectd_client_config
step_config: *step_config step_config: *step_config
config_image: &collectd_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerCollectdConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/collectd.json: /var/lib/kolla/config_files/collectd.json:
command: /usr/sbin/collectd -f command: /usr/sbin/collectd -f
@ -82,7 +86,10 @@ outputs:
docker_config: docker_config:
step_3: step_3:
collectd: collectd:
image: *collectd_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ]
net: host net: host
privileged: true privileged: true
restart: always restart: always

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-congress-api:latest' default: 'centos-binary-congress-api:latest'
type: string type: string
DockerCongressConfigImage: DockerCongressConfigImage:
description: image description: The container image to use for the congress config_volume
default: 'centos-binary-congress-api:latest' default: 'centos-binary-congress-api:latest'
type: string type: string
EndpointMap: EndpointMap:
@ -84,7 +84,7 @@ outputs:
# db sync runs before permissions set by kolla_config # db sync runs before permissions set by kolla_config
step_2: step_2:
congress_init_logs: congress_init_logs:
image: &congress_image image: &congress_api_image
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCongressApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerCongressApiImage} ]
@ -95,7 +95,7 @@ outputs:
command: ['/bin/bash', '-c', 'chown -R congress:congress /var/log/congress'] command: ['/bin/bash', '-c', 'chown -R congress:congress /var/log/congress']
step_3: step_3:
congress_db_sync: congress_db_sync:
image: *congress_image image: *congress_api_image
net: host net: host
privileged: false privileged: false
detach: false detach: false
@ -110,7 +110,7 @@ outputs:
step_4: step_4:
congress_api: congress_api:
start_order: 15 start_order: 15
image: *congress_image image: *congress_api_image
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-mongodb:latest' default: 'centos-binary-mongodb:latest'
type: string type: string
DockerMongodbConfigImage:
description: The container image to use for the mongodb config_volume
default: 'centos-binary-mongodb:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -65,10 +69,10 @@ outputs:
config_volume: mongodb config_volume: mongodb
puppet_tags: file # set this even though file is the default puppet_tags: file # set this even though file is the default
step_config: *step_config step_config: *step_config
config_image: &mongodb_image config_image: &mongodb_config_image
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerMongodbConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/mongodb.json: /var/lib/kolla/config_files/mongodb.json:
command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run
@ -82,7 +86,10 @@ outputs:
docker_config: docker_config:
step_2: step_2:
mongodb: mongodb:
image: *mongodb_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ]
net: host net: host
privileged: false privileged: false
volumes: &mongodb_volumes volumes: &mongodb_volumes
@ -100,7 +107,7 @@ outputs:
config_volume: 'mongodb_init_tasks' config_volume: 'mongodb_init_tasks'
puppet_tags: 'mongodb_database,mongodb_user,mongodb_replset' puppet_tags: 'mongodb_database,mongodb_user,mongodb_replset'
step_config: 'include ::tripleo::profile::base::database::mongodb' step_config: 'include ::tripleo::profile::base::database::mongodb'
config_image: *mongodb_image config_image: *mongodb_config_image
volumes: volumes:
- /var/lib/mongodb:/var/lib/mongodb - /var/lib/mongodb:/var/lib/mongodb
- /var/log/containers/mongodb:/var/log/mongodb - /var/log/containers/mongodb:/var/log/mongodb

View File

@ -8,8 +8,8 @@ parameters:
description: namespace description: namespace
default: 'tripleoupstream' default: 'tripleoupstream'
type: string type: string
DockerMysqlImage: DockerMysqlClientConfigImage:
description: image description: The container image to use for the mysql_client config_volume
default: 'centos-binary-mariadb:latest' default: 'centos-binary-mariadb:latest'
type: string type: string
ServiceNetMap: ServiceNetMap:
@ -61,6 +61,6 @@ outputs:
config_image: config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerMysqlClientConfigImage} ]
# no need for a docker config, this service only generates configuration files # no need for a docker config, this service only generates configuration files
docker_config: {} docker_config: {}

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-mariadb:latest' default: 'centos-binary-mariadb:latest'
type: string type: string
DockerMysqlConfigImage:
description: The container image to use for the mysql config_volume
default: 'centos-binary-mariadb:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -74,10 +78,10 @@ outputs:
config_volume: mysql config_volume: mysql
puppet_tags: file # set this even though file is the default puppet_tags: file # set this even though file is the default
step_config: *step_config step_config: *step_config
config_image: &mysql_image config_image: &mysql_config_image
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerMysqlConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/mysql.json: /var/lib/kolla/config_files/mysql.json:
command: /usr/bin/mysqld_safe command: /usr/bin/mysqld_safe
@ -89,7 +93,10 @@ outputs:
# Kolla_bootstrap runs before permissions set by kolla_config # Kolla_bootstrap runs before permissions set by kolla_config
step_1: step_1:
mysql_init_logs: mysql_init_logs:
image: *mysql_image image: &mysql_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
privileged: false privileged: false
user: root user: root
volumes: volumes:
@ -139,7 +146,7 @@ outputs:
config_volume: 'mysql_init_tasks' config_volume: 'mysql_init_tasks'
puppet_tags: 'mysql_database,mysql_grant,mysql_user' puppet_tags: 'mysql_database,mysql_grant,mysql_user'
step_config: 'include ::tripleo::profile::base::database::mysql' step_config: 'include ::tripleo::profile::base::database::mysql'
config_image: *mysql_image config_image: *mysql_config_image
volumes: volumes:
- /var/lib/mysql:/var/lib/mysql/:ro - /var/lib/mysql:/var/lib/mysql/:ro
- /var/log/containers/mysql:/var/log/mariadb - /var/log/containers/mysql:/var/log/mariadb

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-redis:latest' default: 'centos-binary-redis:latest'
type: string type: string
DockerRedisConfigImage:
description: The container image to use for the redis config_volume
default: 'centos-binary-redis:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -64,10 +68,10 @@ outputs:
# https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763 # https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
puppet_tags: 'exec' puppet_tags: 'exec'
step_config: *step_config step_config: *step_config
config_image: &redis_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerRedisImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerRedisConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/redis.json: /var/lib/kolla/config_files/redis.json:
command: /usr/bin/redis-server /etc/redis.conf command: /usr/bin/redis-server /etc/redis.conf
@ -80,7 +84,10 @@ outputs:
redis_init_logs: redis_init_logs:
start_order: 0 start_order: 0
detach: false detach: false
image: *redis_image image: &redis_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerRedisImage} ]
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-ec2-api:latest' default: 'centos-binary-ec2-api:latest'
type: string type: string
DockerEc2ApiConfigImage:
description: The container image to use for the ec2api config_volume
default: 'centos-binary-ec2-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,10 +67,10 @@ outputs:
config_volume: ec2api config_volume: ec2api
puppet_tags: ec2api_api_paste_ini,ec2api_config puppet_tags: ec2api_api_paste_ini,ec2api_config
step_config: *step_config step_config: *step_config
config_image: &ec2_api_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/ec2_api.json: /var/lib/kolla/config_files/ec2_api.json:
command: /usr/bin/ec2-api command: /usr/bin/ec2-api
@ -84,7 +88,10 @@ outputs:
# db sync runs before permissions set by kolla_config # db sync runs before permissions set by kolla_config
step_2: step_2:
ec2_api_init_logs: ec2_api_init_logs:
image: *ec2_api_image image: &ec2_api_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiImage} ]
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-etcd:latest' default: 'centos-binary-etcd:latest'
type: string type: string
DockerEtcdConfigImage:
description: The container image to use for the etcd config_volume
default: 'centos-binary-etcd:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -67,10 +71,10 @@ outputs:
puppet_config: puppet_config:
config_volume: etcd config_volume: etcd
step_config: *step_config step_config: *step_config
config_image: &etcd_image config_image: &etcd_config_image
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerEtcdImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerEtcdConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/etcd.json: /var/lib/kolla/config_files/etcd.json:
command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml
@ -81,7 +85,10 @@ outputs:
docker_config: docker_config:
step_2: step_2:
etcd: etcd:
image: *etcd_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerEtcdImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always
@ -98,7 +105,7 @@ outputs:
config_volume: 'etcd_init_tasks' config_volume: 'etcd_init_tasks'
puppet_tags: 'etcd_key' puppet_tags: 'etcd_key'
step_config: 'include ::tripleo::profile::base::etcd' step_config: 'include ::tripleo::profile::base::etcd'
config_image: *etcd_image config_image: *etcd_config_image
volumes: volumes:
- /var/lib/config-data/etcd/etc/etcd/:/etc/etcd:ro - /var/lib/config-data/etcd/etc/etcd/:/etc/etcd:ro
- /var/lib/etcd:/var/lib/etcd:ro - /var/lib/etcd:/var/lib/etcd:ro

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-glance-api:latest' default: 'centos-binary-glance-api:latest'
type: string type: string
DockerGlanceApiConfigImage:
description: The container image to use for the glance_api config_volume
default: 'centos-binary-glance-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -74,10 +78,10 @@ outputs:
config_volume: glance_api config_volume: glance_api
puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config
step_config: *step_config step_config: *step_config
config_image: &glance_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/glance_api.json: /var/lib/kolla/config_files/glance_api.json:
command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf
@ -87,7 +91,10 @@ outputs:
# Kolla_bootstrap/db_sync runs before permissions set by kolla_config # Kolla_bootstrap/db_sync runs before permissions set by kolla_config
step_2: step_2:
glance_init_logs: glance_init_logs:
image: *glance_image image: &glance_api_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ]
privileged: false privileged: false
user: root user: root
volumes: volumes:
@ -95,7 +102,7 @@ outputs:
command: ['/bin/bash', '-c', 'chown -R glance:glance /var/log/glance'] command: ['/bin/bash', '-c', 'chown -R glance:glance /var/log/glance']
step_3: step_3:
glance_api_db_sync: glance_api_db_sync:
image: *glance_image image: *glance_api_image
net: host net: host
privileged: false privileged: false
detach: false detach: false
@ -115,7 +122,7 @@ outputs:
map_merge: map_merge:
- glance_api: - glance_api:
start_order: 2 start_order: 2
image: *glance_image image: *glance_api_image
net: host net: host
privileged: false privileged: false
restart: always restart: always
@ -126,7 +133,7 @@ outputs:
- internal_tls_enabled - internal_tls_enabled
- glance_api_tls_proxy: - glance_api_tls_proxy:
start_order: 2 start_order: 2
image: *glance_image image: *glance_api_image
net: host net: host
user: root user: root
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-gnocchi-api:latest' default: 'centos-binary-gnocchi-api:latest'
type: string type: string
DockerGnocchiConfigImage:
description: The container image to use for the gnocchi config_volume
default: 'centos-binary-gnocchi-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -73,10 +77,10 @@ outputs:
config_volume: gnocchi config_volume: gnocchi
puppet_tags: gnocchi_api_paste_ini,gnocchi_config puppet_tags: gnocchi_api_paste_ini,gnocchi_config
step_config: *step_config step_config: *step_config
config_image: &gnocchi_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGnocchiApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/gnocchi_api.json: /var/lib/kolla/config_files/gnocchi_api.json:
command: /usr/sbin/httpd -DFOREGROUND command: /usr/sbin/httpd -DFOREGROUND
@ -88,14 +92,17 @@ outputs:
# db sync runs before permissions set by kolla_config # db sync runs before permissions set by kolla_config
step_2: step_2:
gnocchi_init_log: gnocchi_init_log:
image: *gnocchi_image image: &gnocchi_api_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGnocchiApiImage} ]
user: root user: root
volumes: volumes:
- /var/log/containers/gnocchi:/var/log/gnocchi - /var/log/containers/gnocchi:/var/log/gnocchi
command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R gnocchi:gnocchi /var/log/gnocchi'] command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R gnocchi:gnocchi /var/log/gnocchi']
step_3: step_3:
gnocchi_db_sync: gnocchi_db_sync:
image: *gnocchi_image image: *gnocchi_api_image
net: host net: host
detach: false detach: false
privileged: false privileged: false
@ -109,7 +116,7 @@ outputs:
command: "/usr/bin/bootstrap_host_exec gnocchi_api su gnocchi -s /bin/bash -c '/usr/bin/gnocchi-upgrade --skip-storage'" command: "/usr/bin/bootstrap_host_exec gnocchi_api su gnocchi -s /bin/bash -c '/usr/bin/gnocchi-upgrade --skip-storage'"
step_4: step_4:
gnocchi_api: gnocchi_api:
image: *gnocchi_image image: *gnocchi_api_image
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-gnocchi-metricd:latest' default: 'centos-binary-gnocchi-metricd:latest'
type: string type: string
DockerGnocchiConfigImage:
description: The container image to use for the gnocchi config_volume
default: 'centos-binary-gnocchi-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,10 +67,10 @@ outputs:
config_volume: gnocchi config_volume: gnocchi
puppet_tags: gnocchi_config puppet_tags: gnocchi_config
step_config: *step_config step_config: *step_config
config_image: &gnocchi_metricd_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGnocchiMetricdImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/gnocchi_metricd.json: /var/lib/kolla/config_files/gnocchi_metricd.json:
command: /usr/bin/gnocchi-metricd command: /usr/bin/gnocchi-metricd
@ -77,7 +81,10 @@ outputs:
docker_config: docker_config:
step_4: step_4:
gnocchi_metricd: gnocchi_metricd:
image: *gnocchi_metricd_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGnocchiMetricdImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-gnocchi-statsd:latest' default: 'centos-binary-gnocchi-statsd:latest'
type: string type: string
DockerGnocchiConfigImage:
description: The container image to use for the gnocchi config_volume
default: 'centos-binary-gnocchi-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,10 +67,10 @@ outputs:
config_volume: gnocchi config_volume: gnocchi
puppet_tags: gnocchi_config puppet_tags: gnocchi_config
step_config: *step_config step_config: *step_config
config_image: &gnocchi_statsd_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGnocchiStatsdImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/gnocchi_statsd.json: /var/lib/kolla/config_files/gnocchi_statsd.json:
command: /usr/bin/gnocchi-statsd command: /usr/bin/gnocchi-statsd
@ -77,7 +81,10 @@ outputs:
docker_config: docker_config:
step_4: step_4:
gnocchi_statsd: gnocchi_statsd:
image: *gnocchi_statsd_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGnocchiStatsdImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-haproxy:latest' default: 'centos-binary-haproxy:latest'
type: string type: string
DockerHAProxyConfigImage:
description: The container image to use for the haproxy config_volume
default: 'centos-binary-haproxy:latest'
type: string
ServiceNetMap: ServiceNetMap:
default: {} default: {}
description: Mapping of service_name -> network name. Typically set description: Mapping of service_name -> network name. Typically set
@ -85,17 +89,20 @@ outputs:
config_volume: haproxy config_volume: haproxy
puppet_tags: haproxy_config puppet_tags: haproxy_config
step_config: *step_config step_config: *step_config
config_image: &haproxy_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHAProxyImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/haproxy.json: /var/lib/kolla/config_files/haproxy.json:
command: haproxy -f /etc/haproxy/haproxy.cfg command: haproxy -f /etc/haproxy/haproxy.cfg
docker_config: docker_config:
step_1: step_1:
haproxy: haproxy:
image: *haproxy_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHAProxyImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -13,8 +13,8 @@ parameters:
default: 'centos-binary-heat-api-cfn:latest' default: 'centos-binary-heat-api-cfn:latest'
type: string type: string
# puppet needs the heat-wsgi-api-cfn binary from centos-binary-heat-api-cfn # puppet needs the heat-wsgi-api-cfn binary from centos-binary-heat-api-cfn
DockerHeatConfigImage: DockerHeatApiCfnConfigImage:
description: image description: The container image to use for the heat_api_cfn config_volume
default: 'centos-binary-heat-api-cfn:latest' default: 'centos-binary-heat-api-cfn:latest'
type: string type: string
EndpointMap: EndpointMap:
@ -81,7 +81,7 @@ outputs:
config_image: config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/heat_api_cfn.json: /var/lib/kolla/config_files/heat_api_cfn.json:
command: /usr/sbin/httpd -DFOREGROUND command: /usr/sbin/httpd -DFOREGROUND

View File

@ -13,8 +13,8 @@ parameters:
default: 'centos-binary-heat-api:latest' default: 'centos-binary-heat-api:latest'
type: string type: string
# puppet needs the heat-wsgi-api binary from centos-binary-heat-api # puppet needs the heat-wsgi-api binary from centos-binary-heat-api
DockerHeatConfigImage: DockerHeatApiConfigImage:
description: image description: The container image to use for the heat_api config_volume
default: 'centos-binary-heat-api:latest' default: 'centos-binary-heat-api:latest'
type: string type: string
EndpointMap: EndpointMap:
@ -81,7 +81,7 @@ outputs:
config_image: config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/heat_api.json: /var/lib/kolla/config_files/heat_api.json:
command: /usr/sbin/httpd -DFOREGROUND command: /usr/sbin/httpd -DFOREGROUND

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-heat-engine:latest' default: 'centos-binary-heat-engine:latest'
type: string type: string
DockerHeatConfigImage:
description: The container image to use for the heat config_volume
default: 'centos-binary-heat-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -67,10 +71,10 @@ outputs:
config_volume: heat config_volume: heat
puppet_tags: heat_config,file,concat,file_line puppet_tags: heat_config,file,concat,file_line
step_config: *step_config step_config: *step_config
config_image: &heat_engine_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/heat_engine.json: /var/lib/kolla/config_files/heat_engine.json:
command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
@ -82,7 +86,10 @@ outputs:
# db sync runs before permissions set by kolla_config # db sync runs before permissions set by kolla_config
step_2: step_2:
heat_init_log: heat_init_log:
image: *heat_engine_image image: &heat_engine_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
user: root user: root
volumes: volumes:
- /var/log/containers/heat:/var/log/heat - /var/log/containers/heat:/var/log/heat

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-horizon:latest' default: 'centos-binary-horizon:latest'
type: string type: string
DockerHorizonConfigImage:
description: The container image to use for the horizon config_volume
default: 'centos-binary-horizon:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -70,10 +74,10 @@ outputs:
config_volume: horizon config_volume: horizon
puppet_tags: horizon_config puppet_tags: horizon_config
step_config: {get_attr: [HorizonBase, role_data, step_config]} step_config: {get_attr: [HorizonBase, role_data, step_config]}
config_image: &horizon_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHorizonImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerHorizonConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/horizon.json: /var/lib/kolla/config_files/horizon.json:
command: /usr/sbin/httpd -DFOREGROUND command: /usr/sbin/httpd -DFOREGROUND
@ -88,7 +92,10 @@ outputs:
docker_config: docker_config:
step_2: step_2:
horizon_fix_perms: horizon_fix_perms:
image: *horizon_image image: &horizon_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHorizonImage} ]
user: root user: root
# NOTE Set ownership for /var/log/horizon/horizon.log file here, # NOTE Set ownership for /var/log/horizon/horizon.log file here,
# otherwise it's created by root when generating django cache. # otherwise it's created by root when generating django cache.

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-ironic-api:latest' default: 'centos-binary-ironic-api:latest'
type: string type: string
DockerIronicConfigImage: DockerIronicConfigImage:
description: image description: The container image to use for the ironic config_volume
default: 'centos-binary-ironic-pxe:latest' default: 'centos-binary-ironic-pxe:latest'
type: string type: string
EndpointMap: EndpointMap:
@ -85,7 +85,7 @@ outputs:
# db sync runs before permissions set by kolla_config # db sync runs before permissions set by kolla_config
step_2: step_2:
ironic_init_logs: ironic_init_logs:
image: &ironic_image image: &ironic_api_image
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ]
@ -97,7 +97,7 @@ outputs:
step_3: step_3:
ironic_db_sync: ironic_db_sync:
start_order: 1 start_order: 1
image: *ironic_image image: *ironic_api_image
net: host net: host
privileged: false privileged: false
detach: false detach: false
@ -112,7 +112,7 @@ outputs:
step_4: step_4:
ironic_api: ironic_api:
start_order: 10 start_order: 10
image: *ironic_image image: *ironic_api_image
net: host net: host
user: root user: root
restart: always restart: always

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-ironic-conductor:latest' default: 'centos-binary-ironic-conductor:latest'
type: string type: string
DockerIronicConfigImage: DockerIronicConfigImage:
description: image description: The container image to use for the ironic config_volume
default: 'centos-binary-ironic-pxe:latest' default: 'centos-binary-ironic-pxe:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-ironic-pxe:latest' default: 'centos-binary-ironic-pxe:latest'
type: string type: string
DockerIronicConfigImage: DockerIronicConfigImage:
description: image description: The container image to use for the ironic config_volume
default: 'centos-binary-ironic-pxe:latest' default: 'centos-binary-ironic-pxe:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-iscsid:latest' default: 'centos-binary-iscsid:latest'
type: string type: string
DockerIscsidConfigImage:
description: The container image to use for the iscsid config_volume
default: 'centos-binary-iscsid:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -53,10 +57,10 @@ outputs:
config_volume: iscsid config_volume: iscsid
#puppet_tags: file #puppet_tags: file
step_config: '' step_config: ''
config_image: &iscsid_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIscsidImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerIscsidConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/iscsid.json: /var/lib/kolla/config_files/iscsid.json:
command: /usr/sbin/iscsid -f command: /usr/sbin/iscsid -f
@ -64,7 +68,10 @@ outputs:
step_3: step_3:
iscsid: iscsid:
start_order: 2 start_order: 2
image: *iscsid_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIscsidImage} ]
net: host net: host
privileged: true privileged: true
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-keystone:latest' default: 'centos-binary-keystone:latest'
type: string type: string
DockerKeystoneConfigImage:
description: The container image to use for the keystone config_volume
default: 'centos-binary-keystone:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -86,10 +90,10 @@ outputs:
config_volume: keystone config_volume: keystone
puppet_tags: keystone_config puppet_tags: keystone_config
step_config: *step_config step_config: *step_config
config_image: &keystone_image config_image: &keystone_config_image
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/keystone.json: /var/lib/kolla/config_files/keystone.json:
command: /usr/sbin/httpd -DFOREGROUND command: /usr/sbin/httpd -DFOREGROUND
@ -97,7 +101,10 @@ outputs:
# Kolla_bootstrap/db sync runs before permissions set by kolla_config # Kolla_bootstrap/db sync runs before permissions set by kolla_config
step_2: step_2:
keystone_init_log: keystone_init_log:
image: *keystone_image image: &keystone_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ]
user: root user: root
command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R keystone:keystone /var/log/keystone'] command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R keystone:keystone /var/log/keystone']
volumes: volumes:
@ -153,7 +160,7 @@ outputs:
config_volume: 'keystone_init_tasks' config_volume: 'keystone_init_tasks'
puppet_tags: 'keystone_config,keystone_domain_config,keystone_endpoint,keystone_identity_provider,keystone_paste_ini,keystone_role,keystone_service,keystone_tenant,keystone_user,keystone_user_role,keystone_domain' puppet_tags: 'keystone_config,keystone_domain_config,keystone_endpoint,keystone_identity_provider,keystone_paste_ini,keystone_role,keystone_service,keystone_tenant,keystone_user,keystone_user_role,keystone_domain'
step_config: 'include ::tripleo::profile::base::keystone' step_config: 'include ::tripleo::profile::base::keystone'
config_image: *keystone_image config_image: *keystone_config_image
host_prep_tasks: host_prep_tasks:
- name: create persistent logs directory - name: create persistent logs directory
file: file:

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-manila-api:latest' default: 'centos-binary-manila-api:latest'
type: string type: string
DockerManilaConfigImage: DockerManilaConfigImage:
description: image description: The container image to use for the manila config_volume
default: 'centos-binary-manila-api:latest' default: 'centos-binary-manila-api:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-manila-scheduler:latest' default: 'centos-binary-manila-scheduler:latest'
type: string type: string
DockerManilaConfigImage: DockerManilaConfigImage:
description: image description: The container image to use for the manila config_volume
default: 'centos-binary-manila-api:latest' default: 'centos-binary-manila-api:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-memcached:latest' default: 'centos-binary-memcached:latest'
type: string type: string
DockerMemcachedConfigImage:
description: The container image to use for the memcached config_volume
default: 'centos-binary-memcached:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,17 +67,20 @@ outputs:
config_volume: 'memcached' config_volume: 'memcached'
puppet_tags: 'file' puppet_tags: 'file'
step_config: *step_config step_config: *step_config
config_image: &memcached_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMemcachedImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerMemcachedConfigImage} ]
kolla_config: {} kolla_config: {}
docker_config: docker_config:
step_1: step_1:
memcached_init_logs: memcached_init_logs:
start_order: 0 start_order: 0
detach: false detach: false
image: *memcached_image image: &memcached_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMemcachedImage} ]
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-mistral-api:latest' default: 'centos-binary-mistral-api:latest'
type: string type: string
DockerMistralConfigImage: DockerMistralConfigImage:
description: image description: The container image to use for the mistral config_volume
default: 'centos-binary-mistral-api:latest' default: 'centos-binary-mistral-api:latest'
type: string type: string
EndpointMap: EndpointMap:
@ -84,7 +84,7 @@ outputs:
# db sync runs before permissions set by kolla_config # db sync runs before permissions set by kolla_config
step_2: step_2:
mistral_init_logs: mistral_init_logs:
image: &mistral_image image: &mistral_api_image
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
@ -96,7 +96,7 @@ outputs:
step_3: step_3:
mistral_db_sync: mistral_db_sync:
start_order: 0 start_order: 0
image: *mistral_image image: *mistral_api_image
net: host net: host
privileged: false privileged: false
detach: false detach: false
@ -110,7 +110,7 @@ outputs:
command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head'" command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head'"
mistral_db_populate: mistral_db_populate:
start_order: 1 start_order: 1
image: *mistral_image image: *mistral_api_image
net: host net: host
privileged: false privileged: false
detach: false detach: false
@ -127,7 +127,7 @@ outputs:
step_4: step_4:
mistral_api: mistral_api:
start_order: 15 start_order: 15
image: *mistral_image image: *mistral_api_image
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-mistral-engine:latest' default: 'centos-binary-mistral-engine:latest'
type: string type: string
DockerMistralConfigImage: DockerMistralConfigImage:
description: image description: The container image to use for the mistral config_volume
default: 'centos-binary-mistral-api:latest' default: 'centos-binary-mistral-api:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-mistral-executor:latest' default: 'centos-binary-mistral-executor:latest'
type: string type: string
DockerMistralConfigImage: DockerMistralConfigImage:
description: image description: The container image to use for the mistral config_volume
default: 'centos-binary-mistral-api:latest' default: 'centos-binary-mistral-api:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-multipathd:latest' default: 'centos-binary-multipathd:latest'
type: string type: string
DockerMultipathdConfigImage:
description: The container image to use for the multipathd config_volume
default: 'centos-binary-multipathd:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -53,10 +57,10 @@ outputs:
config_volume: multipathd config_volume: multipathd
#puppet_tags: file #puppet_tags: file
step_config: '' step_config: ''
config_image: &multipathd_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMultipathdImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerMultipathdConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/multipathd.json: /var/lib/kolla/config_files/multipathd.json:
command: /usr/sbin/multipathd -d command: /usr/sbin/multipathd -d
@ -64,7 +68,10 @@ outputs:
step_3: step_3:
multipathd: multipathd:
start_order: 1 start_order: 1
image: *multipathd_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMultipathdImage} ]
net: host net: host
privileged: true privileged: true
restart: always restart: always

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-neutron-server:latest' default: 'centos-binary-neutron-server:latest'
type: string type: string
# we configure all neutron services in the same neutron
DockerNeutronConfigImage: DockerNeutronConfigImage:
description: image description: The container image to use for the neutron config_volume
default: 'centos-binary-neutron-server:latest' default: 'centos-binary-neutron-server:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-neutron-dhcp-agent:latest' default: 'centos-binary-neutron-dhcp-agent:latest'
type: string type: string
# we configure all neutron services in the same neutron
DockerNeutronConfigImage: DockerNeutronConfigImage:
description: image description: The container image to use for the neutron config_volume
default: 'centos-binary-neutron-server:latest' default: 'centos-binary-neutron-server:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-neutron-l3-agent:latest' default: 'centos-binary-neutron-l3-agent:latest'
type: string type: string
# we configure all neutron services in the same neutron
DockerNeutronConfigImage: DockerNeutronConfigImage:
description: image description: The container image to use for the neutron config_volume
default: 'centos-binary-neutron-server:latest' default: 'centos-binary-neutron-server:latest'
type: string type: string
ServiceNetMap: ServiceNetMap:

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-neutron-metadata-agent:latest' default: 'centos-binary-neutron-metadata-agent:latest'
type: string type: string
# we configure all neutron services in the same neutron
DockerNeutronConfigImage: DockerNeutronConfigImage:
description: image description: The container image to use for the neutron config_volume
default: 'centos-binary-neutron-server:latest' default: 'centos-binary-neutron-server:latest'
type: string type: string
ServiceNetMap: ServiceNetMap:

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-neutron-openvswitch-agent:latest' default: 'centos-binary-neutron-openvswitch-agent:latest'
type: string type: string
DockerNeutronConfigImage: DockerNeutronConfigImage:
description: image description: The container image to use for the neutron config_volume
default: 'centos-binary-neutron-server:latest' default: 'centos-binary-neutron-server:latest'
type: string type: string
ServiceNetMap: ServiceNetMap:
@ -79,7 +79,7 @@ outputs:
docker_config: docker_config:
step_4: step_4:
neutron_ovs_agent: neutron_ovs_agent:
image: &neutron_ovs_agent_image image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]

View File

@ -20,7 +20,7 @@ parameters:
default: 'tripleoupstream' default: 'tripleoupstream'
type: string type: string
DockerNeutronConfigImage: DockerNeutronConfigImage:
description: image description: The container image to use for the neutron config_volume
default: 'centos-binary-neutron-server:latest' default: 'centos-binary-neutron-server:latest'
type: string type: string
DefaultPasswords: DefaultPasswords:

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-nova-api:latest' default: 'centos-binary-nova-api:latest'
type: string type: string
DockerNovaConfigImage: DockerNovaConfigImage:
description: image description: The container image to use for the nova config_volume
default: 'centos-binary-nova-base:latest' default: 'centos-binary-nova-base:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-nova-compute:latest' default: 'centos-binary-nova-compute:latest'
type: string type: string
DockerNovaLibvirtConfigImage:
description: The container image to use for the nova_libvirt config_volume
default: 'centos-binary-nova-compute:latest'
type: string
ServiceNetMap: ServiceNetMap:
default: {} default: {}
description: Mapping of service_name -> network name. Typically set description: Mapping of service_name -> network name. Typically set
@ -69,10 +73,10 @@ outputs:
config_volume: nova_libvirt config_volume: nova_libvirt
puppet_tags: nova_config,nova_paste_api_ini puppet_tags: nova_config,nova_paste_api_ini
step_config: *step_config step_config: *step_config
config_image: &nova_compute_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerNovaLibvirtConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/nova_compute.json: /var/lib/kolla/config_files/nova_compute.json:
command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
@ -87,7 +91,10 @@ outputs:
# FIXME: run discover hosts here # FIXME: run discover hosts here
step_4: step_4:
nova_compute: nova_compute:
image: *nova_compute_image image: &nova_compute_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
net: host net: host
privileged: true privileged: true
user: nova user: nova

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-nova-conductor:latest' default: 'centos-binary-nova-conductor:latest'
type: string type: string
DockerNovaConfigImage: DockerNovaConfigImage:
description: image description: The container image to use for the nova config_volume
default: 'centos-binary-nova-base:latest' default: 'centos-binary-nova-base:latest'
type: string type: string
EndpointMap: EndpointMap:
@ -82,7 +82,7 @@ outputs:
docker_config: docker_config:
step_4: step_4:
nova_conductor: nova_conductor:
image: &nova_conductor_image image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaConductorImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerNovaConductorImage} ]

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-nova-consoleauth:latest' default: 'centos-binary-nova-consoleauth:latest'
type: string type: string
DockerNovaConfigImage: DockerNovaConfigImage:
description: image description: The container image to use for the nova config_volume
default: 'centos-binary-nova-base:latest' default: 'centos-binary-nova-base:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -8,12 +8,12 @@ parameters:
description: namespace description: namespace
default: 'tripleoupstream' default: 'tripleoupstream'
type: string type: string
DockerNovaComputeImage: DockerNovaComputeIronicImage:
description: image description: image
default: 'centos-binary-nova-compute-ironic:latest' default: 'centos-binary-nova-compute-ironic:latest'
type: string type: string
DockerNovaConfigImage: DockerNovaConfigImage:
description: image description: The container image to use for the nova config_volume
default: 'centos-binary-nova-base:latest' default: 'centos-binary-nova-base:latest'
type: string type: string
ServiceNetMap: ServiceNetMap:
@ -85,7 +85,7 @@ outputs:
image: image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeIronicImage} ]
net: host net: host
privileged: true privileged: true
user: root user: root

View File

@ -8,14 +8,14 @@ parameters:
description: namespace description: namespace
default: 'tripleoupstream' default: 'tripleoupstream'
type: string type: string
DockerLibvirtImage: DockerNovaLibvirtImage:
description: image description: image
default: 'centos-binary-nova-libvirt:latest' default: 'centos-binary-nova-libvirt:latest'
type: string type: string
# we configure libvirt via the nova-compute container due to coupling # we configure libvirt via the nova-compute container due to coupling
# in the puppet modules # in the puppet modules
DockerNovaConfigImage: DockerNovaLibvirtConfigImage:
description: image description: The container image to use for the nova_libvirt config_volume
default: 'centos-binary-nova-compute:latest' default: 'centos-binary-nova-compute:latest'
type: string type: string
EnablePackageInstall: EnablePackageInstall:
@ -102,7 +102,7 @@ outputs:
config_image: config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerNovaLibvirtConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/nova_libvirt.json: /var/lib/kolla/config_files/nova_libvirt.json:
command: command:
@ -120,7 +120,7 @@ outputs:
image: image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerLibvirtImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerNovaLibvirtImage} ]
net: host net: host
pid: host pid: host
privileged: true privileged: true

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-nova-placement-api:latest' default: 'centos-binary-nova-placement-api:latest'
type: string type: string
DockerNovaPlacementConfigImage:
description: The container image to use for the nova_placement config_volume
default: 'centos-binary-nova-placement-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -66,10 +70,10 @@ outputs:
config_volume: nova_placement config_volume: nova_placement
puppet_tags: nova_config puppet_tags: nova_config
step_config: *step_config step_config: *step_config
config_image: &nova_placement_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/nova_placement.json: /var/lib/kolla/config_files/nova_placement.json:
command: /usr/sbin/httpd -DFOREGROUND command: /usr/sbin/httpd -DFOREGROUND
@ -82,7 +86,10 @@ outputs:
step_3: step_3:
nova_placement: nova_placement:
start_order: 1 start_order: 1
image: *nova_placement_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
net: host net: host
user: root user: root
restart: always restart: always

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-nova-scheduler:latest' default: 'centos-binary-nova-scheduler:latest'
type: string type: string
DockerNovaConfigImage: DockerNovaConfigImage:
description: image description: The container image to use for the nova config_volume
default: 'centos-binary-nova-base:latest' default: 'centos-binary-nova-base:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-nova-novncproxy:latest' default: 'centos-binary-nova-novncproxy:latest'
type: string type: string
DockerNovaConfigImage: DockerNovaConfigImage:
description: image description: The container image to use for the nova config_volume
default: 'centos-binary-nova-base:latest' default: 'centos-binary-nova-base:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-octavia-api:latest' default: 'centos-binary-octavia-api:latest'
type: string type: string
DockerOctaviaConfigImage:
description: The container image to use for the octavia config_volume
default: 'centos-binary-octavia-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -71,10 +75,10 @@ outputs:
config_volume: octavia config_volume: octavia
puppet_tags: octavia_config puppet_tags: octavia_config
step_config: *step_config step_config: *step_config
config_image: &octavia_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOctaviaApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/octavia_api.json: /var/lib/kolla/config_files/octavia_api.json:
command: /usr/bin/octavia-api --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/api.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-api command: /usr/bin/octavia-api --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/api.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-api
@ -85,7 +89,10 @@ outputs:
step_2: step_2:
octavia_api_init_dirs: octavia_api_init_dirs:
start_order: 0 start_order: 0
image: *octavia_image image: &octavia_api_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOctaviaApiImage} ]
user: root user: root
volumes: volumes:
- /var/lib/config-data/octavia/etc/octavia:/etc/octavia/ - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
@ -94,7 +101,7 @@ outputs:
step_3: step_3:
octavia_db_sync: octavia_db_sync:
start_order: 0 start_order: 0
image: *octavia_image image: *octavia_api_image
net: host net: host
privileged: false privileged: false
detach: false detach: false
@ -111,7 +118,7 @@ outputs:
map_merge: map_merge:
- octavia_api: - octavia_api:
start_order: 2 start_order: 2
image: *octavia_image image: *octavia_api_image
net: host net: host
privileged: false privileged: false
restart: always restart: always
@ -122,7 +129,7 @@ outputs:
- internal_tls_enabled - internal_tls_enabled
- octavia_api_tls_proxy: - octavia_api_tls_proxy:
start_order: 2 start_order: 2
image: *octavia_image image: *octavia_api_image
net: host net: host
user: root user: root
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-octavia-health-manager:latest' default: 'centos-binary-octavia-health-manager:latest'
type: string type: string
DockerOctaviaConfigImage:
description: The container image to use for the octavia config_volume
default: 'centos-binary-octavia-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -64,10 +68,10 @@ outputs:
config_volume: octavia config_volume: octavia
puppet_tags: octavia_config puppet_tags: octavia_config
step_config: *step_config step_config: *step_config
config_image: &octavia_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHealthManagerImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/octavia_health_manager.json: /var/lib/kolla/config_files/octavia_health_manager.json:
command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-health-manager command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-health-manager
@ -75,7 +79,10 @@ outputs:
step_2: step_2:
octavia_health_manager_init_dirs: octavia_health_manager_init_dirs:
start_order: 0 start_order: 0
image: *octavia_image image: &octavia_health_manager_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHealthManagerImage} ]
user: root user: root
volumes: volumes:
- /var/lib/config-data/octavia/etc/octavia:/etc/octavia/ - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
@ -83,7 +90,7 @@ outputs:
step_4: step_4:
octavia_health_manager: octavia_health_manager:
start_order: 2 start_order: 2
image: *octavia_image image: *octavia_health_manager_image
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-octavia-housekeeping:latest' default: 'centos-binary-octavia-housekeeping:latest'
type: string type: string
DockerOctaviaConfigImage:
description: The container image to use for the octavia config_volume
default: 'centos-binary-octavia-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -64,10 +68,10 @@ outputs:
config_volume: octavia config_volume: octavia
puppet_tags: octavia_config puppet_tags: octavia_config
step_config: *step_config step_config: *step_config
config_image: &octavia_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHousekeepingImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/octavia_housekeeping.json: /var/lib/kolla/config_files/octavia_housekeeping.json:
command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping
@ -75,7 +79,10 @@ outputs:
step_2: step_2:
octavia_housekeeping_init_dirs: octavia_housekeeping_init_dirs:
start_order: 0 start_order: 0
image: *octavia_image image: &octavia_housekeeping_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHousekeepingImage} ]
user: root user: root
volumes: volumes:
- /var/lib/config-data/octavia/etc/octavia:/etc/octavia/ - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
@ -83,7 +90,7 @@ outputs:
step_4: step_4:
octavia_housekeeping: octavia_housekeeping:
start_order: 2 start_order: 2
image: *octavia_image image: *octavia_housekeeping_image
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-octavia-worker:latest' default: 'centos-binary-octavia-worker:latest'
type: string type: string
DockerOctaviaConfigImage:
description: The container image to use for the octavia config_volume
default: 'centos-binary-octavia-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -64,10 +68,10 @@ outputs:
config_volume: octavia config_volume: octavia
puppet_tags: octavia_config puppet_tags: octavia_config
step_config: *step_config step_config: *step_config
config_image: &octavia_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOctaviaWorkerImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/octavia_worker.json: /var/lib/kolla/config_files/octavia_worker.json:
command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-worker command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-worker
@ -75,7 +79,10 @@ outputs:
step_2: step_2:
octavia_worker_init_dirs: octavia_worker_init_dirs:
start_order: 0 start_order: 0
image: *octavia_image image: &octavia_worker_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOctaviaWorkerImage} ]
user: root user: root
volumes: volumes:
- /var/lib/config-data/octavia/etc/octavia:/etc/octavia/ - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
@ -83,7 +90,7 @@ outputs:
step_4: step_4:
octavia_worker: octavia_worker:
start_order: 2 start_order: 2
image: *octavia_image image: *octavia_worker_image
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-cinder-backup:latest' default: 'centos-binary-cinder-backup:latest'
type: string type: string
# we configure all cinder services in the same cinder base container
DockerCinderConfigImage: DockerCinderConfigImage:
description: image description: The container image to use for the cinder config_volume
default: 'centos-binary-cinder-api:latest' default: 'centos-binary-cinder-api:latest'
type: string type: string
CinderBackupBackend: CinderBackupBackend:

View File

@ -12,9 +12,8 @@ parameters:
description: image description: image
default: 'centos-binary-cinder-volume:latest' default: 'centos-binary-cinder-volume:latest'
type: string type: string
# we configure all cinder services in the same cinder base container
DockerCinderConfigImage: DockerCinderConfigImage:
description: image description: The container image to use for the cinder config_volume
default: 'centos-binary-cinder-api:latest' default: 'centos-binary-cinder-api:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -14,6 +14,10 @@ parameters:
description: image description: image
default: 'centos-binary-mariadb:latest' default: 'centos-binary-mariadb:latest'
type: string type: string
DockerClustercheckConfigImage:
description: The container image to use for the clustercheck config_volume
default: 'centos-binary-mariadb:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,10 +67,10 @@ outputs:
config_volume: clustercheck config_volume: clustercheck
puppet_tags: file # set this even though file is the default puppet_tags: file # set this even though file is the default
step_config: "include ::tripleo::profile::pacemaker::clustercheck" step_config: "include ::tripleo::profile::pacemaker::clustercheck"
config_image: &clustercheck_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerClustercheckImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerClustercheckConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/clustercheck.json: /var/lib/kolla/config_files/clustercheck.json:
command: /usr/sbin/xinetd -dontfork command: /usr/sbin/xinetd -dontfork
@ -87,7 +91,10 @@ outputs:
step_2: step_2:
clustercheck: clustercheck:
start_order: 1 start_order: 1
image: *clustercheck_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerClustercheckImage} ]
restart: always restart: always
net: host net: host
volumes: volumes:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-mariadb:latest' default: 'centos-binary-mariadb:latest'
type: string type: string
DockerMysqlConfigImage:
description: The container image to use for the mysql config_volume
default: 'centos-binary-mariadb:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -77,7 +81,10 @@ outputs:
- - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }" - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
- "exec {'wait-for-settle': command => '/bin/true' }" - "exec {'wait-for-settle': command => '/bin/true' }"
- "include ::tripleo::profile::pacemaker::database::mysql_bundle" - "include ::tripleo::profile::pacemaker::database::mysql_bundle"
config_image: *mysql_image config_image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMysqlConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/mysql.json: /var/lib/kolla/config_files/mysql.json:
command: /usr/sbin/pacemaker_remoted command: /usr/sbin/pacemaker_remoted

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-redis:latest' default: 'centos-binary-redis:latest'
type: string type: string
DockerRedisConfigImage:
description: The container image to use for the redis config_volume
default: 'centos-binary-redis:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -74,7 +78,10 @@ outputs:
puppet_tags: 'exec' puppet_tags: 'exec'
step_config: step_config:
get_attr: [RedisBase, role_data, step_config] get_attr: [RedisBase, role_data, step_config]
config_image: *redis_image config_image: &redis_config_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerRedisConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/redis.json: /var/lib/kolla/config_files/redis.json:
command: /usr/sbin/pacemaker_remoted command: /usr/sbin/pacemaker_remoted
@ -113,7 +120,7 @@ outputs:
params: params:
TAGS: 'pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation' TAGS: 'pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation'
CONFIG: 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::database::redis_bundle' CONFIG: 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::database::redis_bundle'
image: *redis_image image: *redis_config_image
volumes: volumes:
- /etc/hosts:/etc/hosts:ro - /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-haproxy:latest' default: 'centos-binary-haproxy:latest'
type: string type: string
DockerHAProxyConfigImage:
description: The container image to use for the haproxy config_volume
default: 'centos-binary-haproxy:latest'
type: string
ServiceNetMap: ServiceNetMap:
default: {} default: {}
description: Mapping of service_name -> network name. Typically set description: Mapping of service_name -> network name. Typically set
@ -73,7 +77,10 @@ outputs:
- "class tripleo::firewall(){}; define tripleo::firewall::rule( $port = undef, $dport = undef, $sport = undef, $proto = undef, $action = undef, $state = undef, $source = undef, $iniface = undef, $chain = undef, $destination = undef, $extras = undef){}" - "class tripleo::firewall(){}; define tripleo::firewall::rule( $port = undef, $dport = undef, $sport = undef, $proto = undef, $action = undef, $state = undef, $source = undef, $iniface = undef, $chain = undef, $destination = undef, $extras = undef){}"
- "['pcmk_bundle', 'pcmk_resource', 'pcmk_property', 'pcmk_constraint', 'pcmk_resource_default'].each |String $val| { noop_resource($val) }" - "['pcmk_bundle', 'pcmk_resource', 'pcmk_property', 'pcmk_constraint', 'pcmk_resource_default'].each |String $val| { noop_resource($val) }"
- 'include ::tripleo::profile::pacemaker::haproxy_bundle' - 'include ::tripleo::profile::pacemaker::haproxy_bundle'
config_image: *haproxy_image config_image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHAProxyConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/haproxy.json: /var/lib/kolla/config_files/haproxy.json:
command: haproxy -f /etc/haproxy/haproxy.cfg command: haproxy -f /etc/haproxy/haproxy.cfg

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-rabbitmq:latest' default: 'centos-binary-rabbitmq:latest'
type: string type: string
DockerRabbitmqConfigImage:
description: The container image to use for the rabbitmq config_volume
default: 'centos-binary-rabbitmq:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -72,7 +76,10 @@ outputs:
config_volume: rabbitmq config_volume: rabbitmq
puppet_tags: file puppet_tags: file
step_config: *step_config step_config: *step_config
config_image: *rabbitmq_image config_image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/rabbitmq.json: /var/lib/kolla/config_files/rabbitmq.json:
command: /usr/sbin/pacemaker_remoted command: /usr/sbin/pacemaker_remoted

View File

@ -14,6 +14,10 @@ parameters:
description: image description: image
default: 'centos-binary-panko-api:latest' default: 'centos-binary-panko-api:latest'
type: string type: string
DockerPankoConfigImage:
description: The container image to use for the panko config_volume
default: 'centos-binary-panko-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -75,10 +79,10 @@ outputs:
config_volume: panko config_volume: panko
puppet_tags: panko_api_paste_ini,panko_config puppet_tags: panko_api_paste_ini,panko_config
step_config: *step_config step_config: *step_config
config_image: &panko_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerPankoApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerPankoConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/panko_api.json: /var/lib/kolla/config_files/panko_api.json:
command: /usr/sbin/httpd -DFOREGROUND command: /usr/sbin/httpd -DFOREGROUND
@ -89,14 +93,17 @@ outputs:
docker_config: docker_config:
step_2: step_2:
panko_init_log: panko_init_log:
image: *panko_image image: &panko_api_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerPankoApiImage} ]
user: root user: root
volumes: volumes:
- /var/log/containers/panko:/var/log/panko - /var/log/containers/panko:/var/log/panko
command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R panko:panko /var/log/panko'] command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R panko:panko /var/log/panko']
step_3: step_3:
panko_db_sync: panko_db_sync:
image: *panko_image image: *panko_api_image
net: host net: host
detach: false detach: false
privileged: false privileged: false
@ -111,7 +118,7 @@ outputs:
step_4: step_4:
panko_api: panko_api:
start_order: 2 start_order: 2
image: *panko_image image: *panko_api_image
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-rabbitmq:latest' default: 'centos-binary-rabbitmq:latest'
type: string type: string
DockerRabbitmqConfigImage:
description: The container image to use for the rabbitmq config_volume
default: 'centos-binary-rabbitmq:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -73,10 +77,10 @@ outputs:
puppet_config: puppet_config:
config_volume: rabbitmq config_volume: rabbitmq
step_config: *step_config step_config: *step_config
config_image: &rabbitmq_image config_image: &rabbitmq_config_image
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/rabbitmq.json: /var/lib/kolla/config_files/rabbitmq.json:
command: /usr/lib/rabbitmq/bin/rabbitmq-server command: /usr/lib/rabbitmq/bin/rabbitmq-server
@ -90,7 +94,10 @@ outputs:
rabbitmq_init_logs: rabbitmq_init_logs:
start_order: 0 start_order: 0
detach: false detach: false
image: *rabbitmq_image image: &rabbitmq_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ]
privileged: false privileged: false
user: root user: root
volumes: volumes:
@ -146,7 +153,7 @@ outputs:
config_volume: 'rabbit_init_tasks' config_volume: 'rabbit_init_tasks'
puppet_tags: 'rabbitmq_policy,rabbitmq_user' puppet_tags: 'rabbitmq_policy,rabbitmq_user'
step_config: 'include ::tripleo::profile::base::rabbitmq' step_config: 'include ::tripleo::profile::base::rabbitmq'
config_image: *rabbitmq_image config_image: *rabbitmq_config_image
volumes: volumes:
- /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq:ro - /var/lib/rabbitmq:/var/lib/rabbitmq:ro

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-sahara-api:latest' default: 'centos-binary-sahara-api:latest'
type: string type: string
DockerSaharaConfigImage:
description: The container image to use for the sahara config_volume
default: 'centos-binary-sahara-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -64,10 +68,10 @@ outputs:
config_volume: sahara config_volume: sahara
puppet_tags: sahara_api_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template puppet_tags: sahara_api_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
step_config: *step_config step_config: *step_config
config_image: &sahara_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSaharaApiImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerSaharaConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/sahara-api.json: /var/lib/kolla/config_files/sahara-api.json:
command: /usr/bin/sahara-api --config-file /etc/sahara/sahara.conf command: /usr/bin/sahara-api --config-file /etc/sahara/sahara.conf
@ -81,7 +85,10 @@ outputs:
docker_config: docker_config:
step_3: step_3:
sahara_db_sync: sahara_db_sync:
image: *sahara_image image: &sahara_api_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSaharaApiImage} ]
net: host net: host
privileged: false privileged: false
detach: false detach: false
@ -97,7 +104,7 @@ outputs:
command: "/usr/bin/bootstrap_host_exec sahara_api su sahara -s /bin/bash -c 'sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head'" command: "/usr/bin/bootstrap_host_exec sahara_api su sahara -s /bin/bash -c 'sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head'"
step_4: step_4:
sahara_api: sahara_api:
image: *sahara_image image: *sahara_api_image
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-sahara-engine:latest' default: 'centos-binary-sahara-engine:latest'
type: string type: string
DockerSaharaConfigImage:
description: The container image to use for the sahara config_volume
default: 'centos-binary-sahara-api:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -64,10 +68,10 @@ outputs:
config_volume: sahara config_volume: sahara
puppet_tags: sahara_engine_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template puppet_tags: sahara_engine_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
step_config: *step_config step_config: *step_config
config_image: &sahara_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSaharaEngineImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerSaharaConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/sahara-engine.json: /var/lib/kolla/config_files/sahara-engine.json:
command: /usr/bin/sahara-engine --config-file /etc/sahara/sahara.conf command: /usr/bin/sahara-engine --config-file /etc/sahara/sahara.conf
@ -81,7 +85,10 @@ outputs:
docker_config: docker_config:
step_4: step_4:
sahara_engine: sahara_engine:
image: *sahara_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSaharaEngineImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-sensu-client:latest' default: 'centos-binary-sensu-client:latest'
type: string type: string
DockerSensuConfigImage:
description: The container image to use for the sensu config_volume
default: 'centos-binary-sensu-client:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -98,10 +102,10 @@ outputs:
config_volume: sensu config_volume: sensu
puppet_tags: sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check puppet_tags: sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check
step_config: *step_config step_config: *step_config
config_image: &sensu_client_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSensuClientImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerSensuConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/sensu-client.json: /var/lib/kolla/config_files/sensu-client.json:
command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log
@ -112,7 +116,10 @@ outputs:
docker_config: docker_config:
step_3: step_3:
sensu_client: sensu_client:
image: *sensu_client_image image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSensuClientImage} ]
net: host net: host
privileged: true privileged: true
# NOTE(mmagr) kolla image changes the user to 'sensu', we need it # NOTE(mmagr) kolla image changes the user to 'sensu', we need it

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-swift-proxy-server:latest' default: 'centos-binary-swift-proxy-server:latest'
type: string type: string
DockerSwiftConfigImage:
description: The container image to use for the swift config_volume
default: 'centos-binary-swift-proxy-server:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -70,10 +74,10 @@ outputs:
config_volume: swift config_volume: swift
puppet_tags: swift_proxy_config puppet_tags: swift_proxy_config
step_config: *step_config step_config: *step_config
config_image: &swift_proxy_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/swift_proxy.json: /var/lib/kolla/config_files/swift_proxy.json:
command: /usr/bin/swift-proxy-server /etc/swift/proxy-server.conf command: /usr/bin/swift-proxy-server /etc/swift/proxy-server.conf
@ -87,7 +91,10 @@ outputs:
step_4: step_4:
map_merge: map_merge:
- swift_proxy: - swift_proxy:
image: *swift_proxy_image image: &swift_proxy_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
net: host net: host
user: swift user: swift
restart: always restart: always

View File

@ -8,8 +8,8 @@ parameters:
description: namespace description: namespace
default: 'tripleoupstream' default: 'tripleoupstream'
type: string type: string
DockerSwiftProxyImage: DockerSwiftConfigImage:
description: image description: The container image to use for the swift config_volume
default: 'centos-binary-swift-proxy-server:latest' default: 'centos-binary-swift-proxy-server:latest'
type: string type: string
ServiceNetMap: ServiceNetMap:
@ -98,6 +98,6 @@ outputs:
config_image: config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ]
kolla_config: {} kolla_config: {}
docker_config: {} docker_config: {}

View File

@ -24,6 +24,10 @@ parameters:
description: image description: image
default: 'centos-binary-swift-object:latest' default: 'centos-binary-swift-object:latest'
type: string type: string
DockerSwiftConfigImage:
description: The container image to use for the swift config_volume
default: 'centos-binary-swift-proxy-server:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -84,10 +88,10 @@ outputs:
config_volume: swift config_volume: swift
puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config
step_config: *step_config step_config: *step_config
config_image: &swift_proxy_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/swift_account_auditor.json: /var/lib/kolla/config_files/swift_account_auditor.json:
command: /usr/bin/swift-account-auditor /etc/swift/account-server.conf command: /usr/bin/swift-account-auditor /etc/swift/account-server.conf
@ -286,7 +290,10 @@ outputs:
- /var/log/containers/swift:/var/log/swift - /var/log/containers/swift:/var/log/swift
environment: *kolla_env environment: *kolla_env
swift_object_expirer: swift_object_expirer:
image: *swift_proxy_image image: &swift_proxy_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
net: host net: host
user: swift user: swift
restart: always restart: always

View File

@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-tacker:latest' default: 'centos-binary-tacker:latest'
type: string type: string
DockerTackerConfigImage: DockerTackerConfigImage:
description: image description: The container image to use for the tacker config_volume
default: 'centos-binary-tacker:latest' default: 'centos-binary-tacker:latest'
type: string type: string
EndpointMap: EndpointMap:

View File

@ -12,6 +12,10 @@ parameters:
description: image description: image
default: 'centos-binary-zaqar:latest' default: 'centos-binary-zaqar:latest'
type: string type: string
DockerZaqarConfigImage:
description: The container image to use for the zaqar config_volume
default: 'centos-binary-zaqar:latest'
type: string
EndpointMap: EndpointMap:
default: {} default: {}
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
@ -63,10 +67,10 @@ outputs:
config_volume: zaqar config_volume: zaqar
puppet_tags: zaqar_config puppet_tags: zaqar_config
step_config: *step_config step_config: *step_config
config_image: &zaqar_image config_image:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerZaqarConfigImage} ]
kolla_config: kolla_config:
/var/lib/kolla/config_files/zaqar.json: /var/lib/kolla/config_files/zaqar.json:
command: /usr/sbin/httpd -DFOREGROUND command: /usr/sbin/httpd -DFOREGROUND
@ -79,7 +83,10 @@ outputs:
docker_config: docker_config:
step_4: step_4:
zaqar: zaqar:
image: *zaqar_image image: &zaqar_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ]
net: host net: host
privileged: false privileged: false
restart: always restart: always

View File

@ -53,12 +53,22 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'StorageMgmtAllocationPools': ['default'], 'StorageMgmtAllocationPools': ['default'],
} }
PREFERRED_CAMEL_CASE = {
'ec2api': 'Ec2Api',
'haproxy': 'HAProxy',
}
def exit_usage(): def exit_usage():
print('Usage %s <yaml file or directory>' % sys.argv[0]) print('Usage %s <yaml file or directory>' % sys.argv[0])
sys.exit(1) sys.exit(1)
def to_camel_case(string):
return PREFERRED_CAMEL_CASE.get(string, ''.join(s.capitalize() or '_' for
s in string.split('_')))
def get_base_endpoint_map(filename): def get_base_endpoint_map(filename):
try: try:
tpl = yaml.load(open(filename).read()) tpl = yaml.load(open(filename).read())
@ -183,6 +193,13 @@ def validate_docker_service(filename, tpl):
% (key, filename)) % (key, filename))
return 1 return 1
config_volume = puppet_config.get('config_volume')
expected_config_image_parameter = "Docker%sConfigImage" % to_camel_case(config_volume)
if config_volume and not expected_config_image_parameter in tpl.get('parameters', []):
print('ERROR: Missing %s heat parameter for %s config_volume.'
% (expected_config_image_parameter, config_volume))
return 1
if 'parameters' in tpl: if 'parameters' in tpl:
for param in required_params: for param in required_params:
if param not in tpl['parameters']: if param not in tpl['parameters']: