From 8013f3c96c9766f1c69dc0f21df0c354877bb71f Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 6 Aug 2019 11:37:57 -0400 Subject: [PATCH] mysql: remove grep filter workaround for logs Since I01e6c65d18f3a1889f8aaa75e2e6f68175bbc608 was landed, we don't need the workaround which pulled out some logs we didn't want to parse. Change-Id: Ibee22da33391a5e67de02fe08c634a887c9bfa69 Related-Bug: #1811384 --- deployment/database/mysql-container-puppet.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index 53b1ba9c73..c9b3be8555 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/deployment/database/mysql-container-puppet.yaml @@ -268,8 +268,7 @@ outputs: str_replace: # Use a Jinja template below to force str_replace # to quote the resulting string - # TODO: remove the grep filter once #1811384 is fixed - template: &mysql_template '{{ "paunch" }} list --default-runtime RUNTIME -f json -c container -c image | grep -v "isn''t supported by" | jq -r ''.[] | select(.container=="mysql") + {"cli":"RUNTIME"}''' + template: &mysql_template '{{ "paunch" }} list --default-runtime RUNTIME -f json -c container -c image | jq -r ''.[] | select(.container=="mysql") + {"cli":"RUNTIME"}''' params: RUNTIME: "{{ container_cli }}" register: mysql_paunch