Remove custom docker systemd unit file

Bug #1646123 reported by Spyros Trigazis
10
This bug affects 2 people
Affects Status Importance Assigned to Milestone
Magnum
Fix Released
Undecided
Spyros Trigazis

Bug Description

Replace write_docker_service software config with a config that adds the dodcker daemon params in /etc/sysconfig/docker.

Creating a custom docker unit file generates unnecessary incompatibilities between docker versions and distributions.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to magnum (master)

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

Changed in magnum:
status: New → In Progress
Changed in magnum:
assignee: Spyros Trigazis (strigazi) → yatin (yatinkarel)
Changed in magnum:
assignee: yatin (yatinkarel) → Spyros Trigazis (strigazi)
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to magnum (master)

Reviewed: https://review.openstack.org/404789
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=4dd178e7cad0c94fb5a7ab339588fd3c0e560a84
Submitter: Jenkins
Branch: master

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

    Add docker-d options in sysconfig/docker

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

    Change-Id: I6bf91843b9120b700d13aad54cef38342ae1f8bd
    Closes-Bug: #1646123

Changed in magnum:
status: In Progress → Fix Released
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix included in openstack/magnum 4.0.0

This issue was fixed in the openstack/magnum 4.0.0 release.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to magnum (stable/newton)

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/464649

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on magnum (stable/newton)

Change abandoned by Spyros Trigazis (strigazi) (<email address hidden>) on branch: stable/newton
Review: https://review.openstack.org/464649
Reason: Squashed in https://review.openstack.org/#/c/464078/

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to magnum (stable/newton)

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

tags: added: in-stable-newton
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix included in openstack/magnum 3.3.0

This issue was fixed in the openstack/magnum 3.3.0 release.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.