starlingx/stx-puppet
Code Issues Proposed changes

Merge "Multus support for IPv6 service endpoint"

Browse Source
This commit is contained in:
Zuul 2019-08-13 15:58:39 +00:00 committed by Gerrit Code Review
commit 9acef3ca9b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
puppet-manifests/src/modules/platform/templates/multus.yaml.erb
View File

@ -152,6 +152,9 @@ spec:
- |
#!/bin/bash
sed "s|__KUBERNETES_NODE_NAME__|${KUBERNETES_NODE_NAME}|g" /tmp/multus-conf/05-multus.conf > /usr/src/multus-cni/images/05-multus.conf
<%- if @pod_network_ipversion == 6 -%>
sed -i 's#//\${KUBERNETES_SERVICE_HOST}#//\[\${KUBERNETES_SERVICE_HOST}\]#' /entrypoint.sh
<%- end -%>
/entrypoint.sh --multus-conf-file=/usr/src/multus-cni/images/05-multus.conf
resources:
requests: