openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix ironic-pxe startup issues"

Browse Source
This commit is contained in:
Jenkins 2017-07-13 06:19:07 +00:00 committed by Gerrit Code Review
commit 0b8d09b249
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/services/ironic-api.yaml
View File

@ -12,9 +12,9 @@ parameters:
description: image
default: 'centos-binary-ironic-api:latest'
type: string
DockerIronicConfigImage:
description: The container image to use for the ironic config_volume
default: 'centos-binary-ironic-pxe:latest'
DockerIronicApiConfigImage:
description: The container image to use for the ironic_api config_volume
default: 'centos-binary-ironic-api:latest'
type: string
EndpointMap:
default: {}
@ -67,13 +67,13 @@ outputs:
service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: ironic
config_volume: ironic_api
puppet_tags: ironic_config
step_config: *step_config
config_image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
- [ {get_param: DockerNamespace}, {get_param: DockerIronicApiConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/ironic_api.json:
command: /usr/sbin/httpd -DFOREGROUND
@ -111,7 +111,7 @@ outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/ironic/etc/ironic:/etc/ironic:ro
- /var/lib/config-data/ironic_api/etc/ironic:/etc/ironic:ro
- /var/log/containers/ironic:/var/log/ironic
command: "/usr/bin/bootstrap_host_exec ironic_api su ironic -s /bin/bash -c 'ironic-dbsync --config-file /etc/ironic/ironic.conf'"
step_4:
@ -126,7 +126,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro
- /var/lib/config-data/puppet-generated/ironic_api/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/ironic:/var/log/ironic
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS