aboutsummaryrefslogtreecommitdiffstats
path: root/docker/firstboot
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-20 17:28:48 +0000
committerGerrit Code Review <review@openstack.org>2015-11-20 17:28:48 +0000
commit159e78db986257d7b0f3e7e28d26d9d283135fea (patch)
treeac4ce8fbba3290a1fa28f085fc4fdf1f4a98ca57 /docker/firstboot
parent338a2bcfb30aa4aa1660e4eadf3d52c2e09a23c3 (diff)
parent092bcd9283db3379cc2ccc50499e7904d9647c25 (diff)
Merge "Add local docker registry support"
Diffstat (limited to 'docker/firstboot')
-rw-r--r--docker/firstboot/install_docker_agents.yaml8
-rw-r--r--docker/firstboot/start_docker_agents.sh4
2 files changed, 11 insertions, 1 deletions
diff --git a/docker/firstboot/install_docker_agents.yaml b/docker/firstboot/install_docker_agents.yaml
index 8adc893..22a8ff9 100644
--- a/docker/firstboot/install_docker_agents.yaml
+++ b/docker/firstboot/install_docker_agents.yaml
@@ -4,6 +4,12 @@ parameters:
DockerAgentImage:
type: string
default: dprince/heat-docker-agents-centos
+ DockerNamespace:
+ type: string
+ default: kollaglue
+ DockerNamespaceIsRegistry:
+ type: boolean
+ default: false
resources:
@@ -21,6 +27,8 @@ resources:
str_replace:
params:
$agent_image: {get_param: DockerAgentImage}
+ $docker_registry: {get_param: DockerNamespace}
+ $docker_namespace_is_registry: {get_param: DockerNamespaceIsRegistry}
template: {get_file: ./start_docker_agents.sh}
outputs:
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh
index c8b404c..a0e95d1 100644
--- a/docker/firstboot/start_docker_agents.sh
+++ b/docker/firstboot/start_docker_agents.sh
@@ -38,7 +38,9 @@ EOF
#echo "ADD_REGISTRY='--registry-mirror $docker_registry'" >> /etc/sysconfig/docker
# Local docker registry 1.8
-#/bin/sed -i s/ADD_REGISTRY/#ADD_REGISTRY/ /etc/sysconfig/docker
+if [ $docker_namespace_is_registry ]; then
+ /bin/sed -i "s/# INSECURE_REGISTRY='--insecure-registry '/INSECURE_REGISTRY='--insecure-registry $docker_registry'/g" /etc/sysconfig/docker
+fi
/sbin/setenforce 0
/sbin/modprobe ebtables