InternalApiNetCidr conflicts with default docker0 address

[Martin André]

The InternalApiNetCidr in environments/network-environment.yaml conflicts with the default address for docker0 bridge:

InternalApiNetCidr: 172.17.0.0/24

❯ ip a s docker0
8: docker0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN group default
    link/ether 02:42:4b:b3:98:04 brd ff:ff:ff:ff:ff:ff
    inet 172.17.0.1/16 scope global docker0
       valid_lft forever preferred_lft forever

Since we're not using docker0 we should make this address configurable in puppet-tripleo and change it to something else in the t-h-t.

See also https://bugzilla.redhat.com/show_bug.cgi?id=1503021 were docker0 mess around with split-stack environments.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/514576

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/514581

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/514576
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=4462260182b5b6a8922193aff3ff603bbb93cf00
Submitter: Zuul
Branch: master

commit 4462260182b5b6a8922193aff3ff603bbb93cf00
Author: Martin André <email address hidden>
Date: Tue Oct 24 11:10:07 2017 +0200

    Make docker network configurable

    The default docker0 address conflicts with the InternalApiNetCidr value
    set in environments/network-environment.yaml. We should provide a way
    to make the docker network configurable.

    Change-Id: Ie803b33c93b931f7fefb87b6833eb22fd59cd92d
    Related-Bug: #1726773

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/pike
Review: https://review.openstack.org/517661

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/514581
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=509209a29be1ac3e72d6ea97eaf328760693daaf
Submitter: Zuul
Branch: master

commit 509209a29be1ac3e72d6ea97eaf328760693daaf
Author: Martin André <email address hidden>
Date: Tue Oct 24 11:36:06 2017 +0200

    Configure docker0 bridge address

    This was previously conflicting with the InternalApiNetCidr value in
    environments/network-environment.yaml.

    Change-Id: I3f1cb6f056fb19a1ba93d1076191abe7aca4fa21
    Depends-On: Ie803b33c93b931f7fefb87b6833eb22fd59cd92d
    Closes-Bug: #1726773

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/518853

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/518853
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=262310042dd5a64986c10674aa8e7c990f92a77b
Submitter: Zuul
Branch: stable/pike

commit 262310042dd5a64986c10674aa8e7c990f92a77b
Author: Martin André <email address hidden>
Date: Tue Oct 24 11:36:06 2017 +0200

    Configure docker0 bridge address

    This was previously conflicting with the InternalApiNetCidr value in
    environments/network-environment.yaml.

    Change-Id: I3f1cb6f056fb19a1ba93d1076191abe7aca4fa21
    Depends-On: Ie803b33c93b931f7fefb87b6833eb22fd59cd92d
    Closes-Bug: #1726773
    (cherry picked from commit 509209a29be1ac3e72d6ea97eaf328760693daaf)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 7.0.4 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 8.0.0.0b2 development milestone.