diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-11-07 08:24:23 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2018-11-08 07:21:14 +0000 |
| commit | 2ef9fa5ba9b3f99ccfa984574ef31e56e325b068 (patch) | |
| tree | 09ffa6b38e635f60ccd28a3bc6ebee3b5604645a /resources | |
| parent | bb32c95f445c8481b991b0b3d48e1fbfa352f3c7 (diff) | |
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 <pmikus@cisco.com>
Diffstat (limited to 'resources')
6 files changed, 8 insertions, 12 deletions
diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh index d5c294a4b5..1d00f6b0d0 100644 --- a/resources/libraries/bash/function/gather.sh +++ b/resources/libraries/bash/function/gather.sh @@ -166,7 +166,7 @@ function gather_ligato () { # Clone & checkout stable vpp-agent. cd "${CSIT_DIR}" || die "Change directory failed!" - git clone -b "${vpp_agent_stable_ver}" --single-branch \ + git clone -b master --single-branch \ "${ligato_repo_url}/vpp-agent" "vpp-agent" || { die "Failed to run: git clone ${ligato_repo_url}/vpp-agent!" } 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 |