Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Keep existing data for containerized RabbitMQ"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
ironic-pxe.yaml
diff --git
a/docker/services/ironic-pxe.yaml
b/docker/services/ironic-pxe.yaml
index
2550519
..
370b665
100644
(file)
--- a/
docker/services/ironic-pxe.yaml
+++ b/
docker/services/ironic-pxe.yaml
@@
-40,10
+40,6
@@
outputs:
step_config: &step_config ''
service_config_settings: {}
# BEGIN DOCKER SETTINGS
step_config: &step_config ''
service_config_settings: {}
# BEGIN DOCKER SETTINGS
- docker_image: &ironic_pxe_image
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
puppet_config:
config_volume: ironic
puppet_tags: ironic_config
puppet_config:
config_volume: ironic
puppet_tags: ironic_config
@@
-103,7
+99,10
@@
outputs:
step_4:
ironic_pxe_tftp:
start_order: 90
step_4:
ironic_pxe_tftp:
start_order: 90
- image: *ironic_pxe_image
+ image: &ironic_pxe_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always