diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-28 16:32:38 -0500 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 09:05:42 -0500 |
commit | 7d561bd252a4ddc9e204f31144fbed7fecd99bff (patch) | |
tree | 372252fd59dfa4e1f576e54977375621858281d0 /roles/openshift_node/templates/openvswitch.docker.service | |
parent | 6b25d27ca4ad9458688902d0c3e7c3a9c7b9c15d (diff) | |
download | openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.tar.gz openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.tar.bz2 openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.tar.xz openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.zip |
Correctly set the image tag for containerized installs (and upgrades)
Diffstat (limited to 'roles/openshift_node/templates/openvswitch.docker.service')
-rw-r--r-- | roles/openshift_node/templates/openvswitch.docker.service | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_node/templates/openvswitch.docker.service b/roles/openshift_node/templates/openvswitch.docker.service index 6c02b26bf..7af2b7431 100644 --- a/roles/openshift_node/templates/openvswitch.docker.service +++ b/roles/openshift_node/templates/openvswitch.docker.service @@ -4,8 +4,9 @@ Requires=docker.service PartOf=docker.service [Service] +EnvironmentFile=/etc/sysconfig/openvswitch ExecStartPre=-/usr/bin/docker rm -f openvswitch -ExecStart=/usr/bin/docker run --name openvswitch --rm --privileged --net=host --pid=host -v /lib/modules:/lib/modules -v /run:/run -v /sys:/sys:ro -v /etc/origin/openvswitch:/etc/openvswitch {{ openshift.node.ovs_image }} +ExecStart=/usr/bin/docker run --name openvswitch --rm --privileged --net=host --pid=host -v /lib/modules:/lib/modules -v /run:/run -v /sys:/sys:ro -v /etc/origin/openvswitch:/etc/openvswitch {{ openshift.node.ovs_image }}:${IMAGE_VERSION} ExecStartPost=/usr/bin/sleep 5 ExecStop=/usr/bin/docker stop openvswitch Restart=always |