puppet-tripleo: The docker and docker-registry profiles both configure insecure registries

[Dan Prince]

We've now got two separate manifests for manifests/profile/base/docker_registry.pp and manifests/profile/base/docker.pp that both manage the /etc/sysconfig/docker file. Both profiles are configuring the INSECURE_REGISTRY value in /etc/sysconfig/docker in a way that could be confusing to the end user depending on how hiera is setup.

Although the docker_registry.pp is older I believe it should actually stop configuring this file as it has little to do with that service and instead more relates to the docker profile. Additionally the docker profile supports a more free form array way to configure the parameter so should prove to be more flexible to us in the long run.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/525755
Committed: https://git.openstack.org/cgit/openstack/instack-undercloud/commit/?id=ff54f74506919e57cd97fa0594b2ea087c234d8b
Submitter: Zuul
Branch: master

commit ff54f74506919e57cd97fa0594b2ea087c234d8b
Author: Dan Prince <email address hidden>
Date: Tue Dec 5 16:05:20 2017 -0500

    Use the docker profile to set INSECURE_REGISTRY

    This patch updates our instack-undercloud configuration so that
    we leverage the tripleo::profile::base::docker manifest's
    insecure_registry parameter to manage INSECURE_REGISTRY.
    This makes sense since that setting is directly related to
    the docker service itself and not the docker registry.

    This can prevent these two manifests from clobbering each others
    settings if they are both used alongside of each other.

    Change-Id: I9e9c495b9095590dcee14e0705728c68c058d2b5
    Related-bug: #1736587

[OpenStack Infra (hudson-openstack)]

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

commit b2521749561bc7b1d6da9e5b776c2945c65977a0
Author: Dan Prince <email address hidden>
Date: Tue Dec 5 16:15:32 2017 -0500

    Remove INSECURE_REGISTRY from docker_registry.pp

    This patch removes the INSECURE_REGISTRY options from the
    docker_registry manifest. These configuration options can
    conflict with the configuration done in the docker
    profile. Furthermore they are not directly related to
    the docker registry service itself and are better managed
    as part of the other profile.

    Depends-On: I9e9c495b9095590dcee14e0705728c68c058d2b5

    Change-Id: I6d0cfc9aafd2184161666bb9edcce16a0ec5a06f
    Closes-bug: #1736587

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-tripleo 8.2.0 release.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/587190
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=80c5a07aa5a0a9042789a067aa175a1ddfe0a193
Submitter: Zuul
Branch: stable/pike

commit 80c5a07aa5a0a9042789a067aa175a1ddfe0a193
Author: Dan Prince <email address hidden>
Date: Tue Dec 5 16:15:32 2017 -0500

    Remove INSECURE_REGISTRY from docker_registry.pp

    This patch removes the INSECURE_REGISTRY options from the
    docker_registry manifest. These configuration options can
    conflict with the configuration done in the docker
    profile. Furthermore they are not directly related to
    the docker registry service itself and are better managed
    as part of the other profile.

    Change-Id: I6d0cfc9aafd2184161666bb9edcce16a0ec5a06f
    Closes-bug: #1736587
    Closes-bug: #1736803
    (cherry picked from commit b2521749561bc7b1d6da9e5b776c2945c65977a0)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-tripleo 7.4.15 release.