Remove docker --iptables=false on the undercloud

Change I875fa14f7d810c7f0aba3b3a1b04b60a19470f0f 'Configure dockerd with
--iptables=false' broke building kolla images on the undercloud.

The reason for this is the following: - iptables=false makes sense on
the overcloud where we are using net=host for our containers - on the
undercloud however, when we build a container with kolla it gets spawned
without net=host and so it does need some custom docker NAT rules in
order to reach the internet.

Kolla builds will fail trying to resolve repos (DNS/http/any traffic
won't make it to any external network).

Change-Id: Id0984a047e51f6e0ab198ded225e6811f91420ac
Closes-Bug: #1709325
This commit is contained in:
Michele Baldessari 2017-08-08 16:22:39 +02:00
parent 88c3b8529b
commit 63ff236eca
1 changed files with 2 additions and 0 deletions

View File

@ -721,6 +721,8 @@ tripleo::haproxy::docker_registry: true
# Docker
tripleo::profile::base::docker::step: 1
# Undercloud should not have --iptables=false by default hence this override (LP#1709325)
tripleo::profile::base::docker::docker_options: '--log-driver=journald --signature-verification=false'
{{#DOCKER_REGISTRY_MIRROR}}
tripleo::profile::base::docker::registry_mirror: {{DOCKER_REGISTRY_MIRROR}}
{{/DOCKER_REGISTRY_MIRROR}}