aboutsummaryrefslogtreecommitdiffstats
path: root/docker/firstboot
diff options
context:
space:
mode:
authorIan Main <imain@redhat.com>2017-06-30 18:30:33 -0400
committerDan Prince <dprince@redhat.com>2017-07-20 16:15:21 -0400
commit8a305da32aaff257e01691e7d0f61abb4ed75bf3 (patch)
tree7127631f73ffb8decb4dd5d37ce6463ed166cbba /docker/firstboot
parent782f68c8fd6df1c3ee00fd19d5a8ff9447689d72 (diff)
Remove DockerNamespace references
This patch removes more of the DockerNamespace references as part of the cleanup/reorg of the container configuration patches. This also adds a centos-rdo environment file for use with the new interface. This file was generated with the command "openstack overcloud container image prepare" Depends-On: I729fa00175cb36b02b882d729aae5ff06d0e3fbc Depends-On: I292162d66880278de09f7acbdbf02e2312c5bb2b Co-Authored-By: Dan Prince <dprince@redhat.com> Change-Id: Ice7b57c25248634240a6dd6e14e6d411e7806326
Diffstat (limited to 'docker/firstboot')
-rw-r--r--docker/firstboot/setup_docker_host.yaml16
1 files changed, 1 insertions, 15 deletions
diff --git a/docker/firstboot/setup_docker_host.yaml b/docker/firstboot/setup_docker_host.yaml
index 41b036d..ddfa880 100644
--- a/docker/firstboot/setup_docker_host.yaml
+++ b/docker/firstboot/setup_docker_host.yaml
@@ -1,14 +1,5 @@
heat_template_version: pike
-parameters:
- DockerNamespace:
- type: string
- default: tripleoupstream
- description: namespace
- DockerNamespaceIsRegistry:
- type: boolean
- default: false
-
resources:
userdata:
@@ -21,12 +12,7 @@ resources:
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: