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 "Stop also openstack-swift-object-expirer when upgrading swift services"
[apex-tripleo-heat-templates.git]
/
docker
/
firstboot
/
setup_docker_host.yaml
diff --git
a/docker/firstboot/setup_docker_host.yaml
b/docker/firstboot/setup_docker_host.yaml
index
2f25898
..
ddfa880
100644
(file)
--- a/
docker/firstboot/setup_docker_host.yaml
+++ b/
docker/firstboot/setup_docker_host.yaml
@@
-1,12
+1,4
@@
-heat_template_version: ocata
-
-parameters:
- DockerNamespace:
- type: string
- default: tripleoupstream
- DockerNamespaceIsRegistry:
- type: boolean
- default: false
+heat_template_version: pike
resources:
resources:
@@
-20,12
+12,7
@@
resources:
type: OS::Heat::SoftwareConfig
properties:
group: script
type: OS::Heat::SoftwareConfig
properties:
group: script
- config:
- str_replace:
- params:
- $docker_registry: {get_param: DockerNamespace}
- $docker_namespace_is_registry: {get_param: DockerNamespaceIsRegistry}
- template: {get_file: ./setup_docker_host.sh}
+ config: {get_file: ./setup_docker_host.sh}
outputs:
OS::stack_id:
outputs:
OS::stack_id: