Skip to content

Commit a76177d

Browse files
committed
make ip-fabric-forwarding and ip-fabric-snat features configurable
it is true by default which leads to sporadically non-working tests. let's make it configurable and enabled by default. the tests will disable it. Change-Id: Icaa6a0724c100d93f04eeca5bf207daaed3a48c0
1 parent a46f696 commit a76177d

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

kubernetes/manifests/contrail-dpdk-standalone-kubernetes.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ data:
4141
HUGE_PAGES: "{{ HUGE_PAGES }}"
4242
NIC_OFFLOAD_ENABLE: {{ NIC_OFFLOAD_ENABLE }}
4343
KAFKA_NODES: {{ KAFKA_NODES }}
44-
KUBERNETES_IP_FABRIC_FORWARDING: "true"
44+
KUBERNETES_IP_FABRIC_FORWARDING: "{{ KUBERNETES_IP_FABRIC_FORWARDING }}"
45+
KUBERNETES_IP_FABRIC_SNAT: "{{ KUBERNETES_IP_FABRIC_SNAT }}"
4546
KUBERNETES_PUBLIC_FIP_POOL: "{{ KUBERNETES_PUBLIC_FIP_POOL }}"
4647
LOG_LEVEL: {{ LOG_LEVEL }}
4748
METADATA_PROXY_SECRET: {{ METADATA_PROXY_SECRET }}

kubernetes/manifests/contrail-standalone-kubernetes.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ data:
2626
CONFIGDB_NODES: {{ CONFIGDB_NODES }}
2727
CONTROL_NODES: {{ CONTROL_NODES }}
2828
CONTROLLER_NODES: {{ CONTROLLER_NODES }}
29-
KUBERNETES_IP_FABRIC_FORWARDING: "true"
29+
KUBERNETES_IP_FABRIC_FORWARDING: "{{ KUBERNETES_IP_FABRIC_FORWARDING }}"
30+
KUBERNETES_IP_FABRIC_SNAT: "{{ KUBERNETES_IP_FABRIC_SNAT }}"
3031
KUBERNETES_PUBLIC_FIP_POOL: "{{ KUBERNETES_PUBLIC_FIP_POOL }}"
3132
LOG_LEVEL: {{ LOG_LEVEL }}
3233
METADATA_PROXY_SECRET: {{ METADATA_PROXY_SECRET }}

parse-env.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ export CLOUD_ORCHESTRATOR=${CLOUD_ORCHESTRATOR:-'none'}
159159

160160
export KUBERNETES_API_SERVER=${KUBERNETES_API_SERVER:-$HOST_IP}
161161
export KUBERNETES_API_SECURE_PORT=${KUBERNETES_API_SECURE_PORT:-'6443'}
162+
export KUBERNETES_IP_FABRIC_SNAT=${KUBERNETES_IP_FABRIC_SNAT:-'false'}
163+
export KUBERNETES_IP_FABRIC_FORWARDING=${KUBERNETES_IP_FABRIC_FORWARDING:-'true'}
162164

163165
export DPDK_UIO_DRIVER=${DPDK_UIO_DRIVER:-'uio_pci_generic'}
164166
export CPU_CORE_MASK=${CPU_CORE_MASK:-'0x01'}

0 commit comments

Comments
 (0)