Comment 6 for bug 1646123

Reviewed: https://review.openstack.org/464078
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=9fb7d7fa68f7f3864b240ee6b688eb8ce6db430c
Submitter: Jenkins
Branch: stable/newton

commit 9fb7d7fa68f7f3864b240ee6b688eb8ce6db430c
Author: Spyros Trigazis <email address hidden>
Date: Wed Nov 30 15:20:28 2016 +0100

    Upgrade to Fedora 25

    Atomic image contains:
    kubernetes-1.5.3-1.fc25.x86_64
    docker-1.12.6-5.git037a2f5.fc25.x86_64
    flannel-0.5.5-8.fc25.x86_64
    etcd-3.0.15-1.fc25.x86_64

    The ironic image contains exactly the same packages.

    * For this upgrade the upstream image is used, which is
      uploaded here [1].
    * Minor changes for flannel and docker-storage-setup
      were needed.
    * The image will be built in the CI and uploaded to
      tarballs.openstack.org as soon as possible.
    * Ironic image [2].

    Notes:
    * docker-storage-setup config changes were needed because in
      the previous images it was disabled and it was started by us.
    * We can have selinux enables in containers since the images
      have kernel 4.9.x.
    * relabel selinux tags for swarm-manager certificates directory

    [1] https://fedorapeople.org/groups/magnum/fedora-atomic-25-latest.qcow2
    [2] https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic.tar.gz

     Conflicts:
     magnum/drivers/common/templates/fragments/configure_docker_storage_driver_atomic.sh
     magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
     magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh
     magnum/drivers/common/templates/kubernetes/fragments/write-network-config.sh
     magnum/drivers/k8s_fedora_atomic_v1/version.py
     magnum/drivers/k8s_fedora_ironic_v1/version.py
     magnum/drivers/swarm_fedora_atomic_v1/version.py
     magnum/tests/contrib/gate_hook.sh

    (Cherry-picked from d2532a3af2a396a2b7cb9b9fa2394cf2d2c1f0a6)

    Add docker-d options in sysconfig/docker

    Remove custom docker unit file and pass the necessary options
    through /etc/sysconfig/docker file.

    Closes-Bug: #1646123
    (Cherry-picked from 4dd178e7cad0c94fb5a7ab339588fd3c0e560a84)

    Change-Id: If0a430893af582e2efbd57dc171d056b109ee803