diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-25 13:12:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 13:12:23 -0700 |
| commit | 1a181eb827c2037c95f794c835f1777f2dff76ec (patch) | |
| tree | 3a10557a57f07e212aa44020185d09f18139a6a7 /roles/openshift_node/templates | |
| parent | 4ceb4bd931fa48b1f666d2258fff763b29bffba8 (diff) | |
| parent | a468322fda65e49e0ef337d482945b6c5dd40270 (diff) | |
| download | openshift-1a181eb827c2037c95f794c835f1777f2dff76ec.tar.gz openshift-1a181eb827c2037c95f794c835f1777f2dff76ec.tar.bz2 openshift-1a181eb827c2037c95f794c835f1777f2dff76ec.tar.xz openshift-1a181eb827c2037c95f794c835f1777f2dff76ec.zip | |
Merge pull request #5269 from rparulek/nuage-ansible
Automatic merge from submit-queue
Changes for Nuage atomic ansible install
Diffstat (limited to 'roles/openshift_node/templates')
| -rw-r--r-- | roles/openshift_node/templates/openshift.docker.node.service | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/openshift.docker.node.service b/roles/openshift_node/templates/openshift.docker.node.service index 4ab10b95f..310d8b29d 100644 --- a/roles/openshift_node/templates/openshift.docker.node.service +++ b/roles/openshift_node/templates/openshift.docker.node.service @@ -34,6 +34,7 @@ ExecStart=/usr/bin/docker run --name {{ openshift.common.service_type }}-node \ -v /lib/modules:/lib/modules -v /etc/origin/openvswitch:/etc/openvswitch \ -v /etc/origin/sdn:/etc/openshift-sdn -v /var/lib/cni:/var/lib/cni \ -v /etc/systemd/system:/host-etc/systemd/system -v /var/log:/var/log \ + {% if openshift_use_nuage | default(false) -%} $NUAGE_ADDTL_BIND_MOUNTS {% endif -%} \ -v /dev:/dev $DOCKER_ADDTL_BIND_MOUNTS -v /etc/pki:/etc/pki:ro \ {% if l_bind_docker_reg_auth %} -v {{ oreg_auth_credentials_path }}:/root/.docker:ro{% endif %}\ {{ openshift.node.node_image }}:${IMAGE_VERSION} |