From 2ef9fa5ba9b3f99ccfa984574ef31e56e325b068 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 7 Nov 2018 08:24:23 +0000 Subject: FIX: Ligato tests - Freeze stable sfc_controller version - Remove kafka connection - Add debug level outputs - Use mater branch instead of dev Change-Id: Icde06a741cae6393fe482a493eb214d015f145bf Signed-off-by: Peter Mikus --- resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml | 4 ---- resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml | 4 ---- resources/templates/kubernetes/pods/contiv-sfc-controller.yaml | 4 ++-- resources/templates/kubernetes/pods/contiv-vnf.yaml | 4 +++- resources/templates/kubernetes/pods/contiv-vswitch.yaml | 2 ++ 5 files changed, 7 insertions(+), 11 deletions(-) (limited to 'resources/templates') diff --git a/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml b/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml index 17db0bf86f..619639f980 100644 --- a/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml +++ b/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml @@ -10,10 +10,6 @@ data: endpoints: - "172.17.0.1:22379" - kafka.conf: | - addrs: - - "172.17.0.1:9092" - telemetry.conf: | polling-interval: 30000000000 disabled: true diff --git a/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml b/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml index d22199ceee..4c8122f239 100644 --- a/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml +++ b/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml @@ -10,10 +10,6 @@ data: endpoints: - "172.17.0.1:22379" - kafka.conf: | - addrs: - - "172.17.0.1:9092" - telemetry.conf: | polling-interval: 30000000000 disabled: true diff --git a/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml b/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml index 44ceaae1ac..9fbb0e950c 100644 --- a/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml +++ b/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml @@ -6,7 +6,7 @@ metadata: spec: containers: - name: "sfc-controller" - image: ligato/prod_sfc_controller + image: ligato/prod_sfc_controller:v0.0.1-102-gc74fec6 imagePullPolicy: Always command: - /bin/sfc-controller @@ -18,4 +18,4 @@ spec: volumes: - name: controller-config configMap: - name: sfc-controller-cfg \ No newline at end of file + name: sfc-controller-cfg diff --git a/resources/templates/kubernetes/pods/contiv-vnf.yaml b/resources/templates/kubernetes/pods/contiv-vnf.yaml index 5ef89b5716..ee3f447e6a 100644 --- a/resources/templates/kubernetes/pods/contiv-vnf.yaml +++ b/resources/templates/kubernetes/pods/contiv-vnf.yaml @@ -26,6 +26,8 @@ spec: env: - name: MICROSERVICE_LABEL value: $$VNF$$ + - name: INITIAL_LOGLVL + value: debug volumeMounts: - name: vpp-config mountPath: /etc/vpp @@ -42,4 +44,4 @@ spec: name: vnf-agent-cfg - name: memif-sockets hostPath: - path: /tmp \ No newline at end of file + path: /tmp diff --git a/resources/templates/kubernetes/pods/contiv-vswitch.yaml b/resources/templates/kubernetes/pods/contiv-vswitch.yaml index ed0f449e2d..e987307195 100644 --- a/resources/templates/kubernetes/pods/contiv-vswitch.yaml +++ b/resources/templates/kubernetes/pods/contiv-vswitch.yaml @@ -28,6 +28,8 @@ spec: env: - name: MICROSERVICE_LABEL value: vswitch + - name: INITIAL_LOGLVL + value: debug volumeMounts: - name: vpp-config mountPath: /etc/vpp -- cgit 1.2.3-korg