openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Update log-driver value for podman"

Browse Source
This commit is contained in:
Zuul
2019-09-25 08:35:41 +00:00
committed by Gerrit Code Review
parent 69626b0575 0976e4eeb3
commit ebe6f1a300
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/neutron/dibbler-client.epp
View File

@@ -28,7 +28,7 @@ LOGGING=''
CMD="ip netns exec ${NETNS} /usr/sbin/dibbler-client run" CMD="ip netns exec ${NETNS} /usr/sbin/dibbler-client run"
<%- } elsif $container_cli == 'podman' { -%> <%- } elsif $container_cli == 'podman' { -%>
CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log" LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
CMD='/usr/sbin/dibbler-client run' CMD='/usr/sbin/dibbler-client run'
<%- } else { -%> <%- } else { -%>
CLI='echo noop' CLI='echo noop'

2
templates/neutron/dnsmasq.epp
View File

@@ -25,7 +25,7 @@ LOGGING=''
CMD="ip netns exec ${NETNS} /usr/sbin/dnsmasq -k" CMD="ip netns exec ${NETNS} /usr/sbin/dnsmasq -k"
<%- } elsif $container_cli == 'podman' { -%> <%- } elsif $container_cli == 'podman' { -%>
CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log" LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
CMD='/usr/sbin/dnsmasq -k' CMD='/usr/sbin/dnsmasq -k'
<%- } else { -%> <%- } else { -%>
CLI='echo noop' CLI='echo noop'

2
templates/neutron/haproxy.epp
View File

@@ -26,7 +26,7 @@ LOGGING=''
CMD="ip netns exec ${NETNS} "'$HAPROXY' CMD="ip netns exec ${NETNS} "'$HAPROXY'
<%- } elsif $container_cli == 'podman' { -%> <%- } elsif $container_cli == 'podman' { -%>
CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log" LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
CMD='$HAPROXY' CMD='$HAPROXY'
<%- } else { -%> <%- } else { -%>
CLI='echo noop' CLI='echo noop'

2
templates/neutron/keepalived.epp
View File

@@ -25,7 +25,7 @@ LOGGING=''
CMD="ip netns exec ${NETNS} /usr/sbin/keepalived -n -l -D" CMD="ip netns exec ${NETNS} /usr/sbin/keepalived -n -l -D"
<%- } elsif $container_cli == 'podman' { -%> <%- } elsif $container_cli == 'podman' { -%>
CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log" LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
CMD='/usr/sbin/keepalived -n -l -D' CMD='/usr/sbin/keepalived -n -l -D'
<%- } else { -%> <%- } else { -%>
CLI='echo noop' CLI='echo noop'

2
templates/neutron/radvd.epp
View File

@@ -25,7 +25,7 @@ LOGGING=''
CMD="ip netns exec qrouter-${NETWORK_ID} /usr/sbin/radvd -n" CMD="ip netns exec qrouter-${NETWORK_ID} /usr/sbin/radvd -n"
<%- } elsif $container_cli == 'podman' { -%> <%- } elsif $container_cli == 'podman' { -%>
CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log" LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
CMD='/usr/sbin/radvd -n' CMD='/usr/sbin/radvd -n'
<%- } else { -%> <%- } else { -%>
CLI='echo noop' CLI='echo noop'