From 5afbb354d52683c3b055671378d4d392889cd35b Mon Sep 17 00:00:00 2001
From: Sreejith Punnapuzha <Sreejith.Punnapuzha@outlook.com>
Date: Thu, 4 Nov 2021 15:25:51 +0000
Subject: [PATCH] Align docker install role with airshipctl

airshipctl is using upstream ensure-docker role instead of
docker-install. correcting this in treasuremap

Signed-off-by: Sreejith Punnapuzha <Sreejith.Punnapuzha@outlook.com>
Change-Id: Ideea1d9f641d6abad1d9f7c37698f7c09f778fce
---
 playbooks/airship-treasuremap-build-gate.yaml    | 2 +-
 playbooks/airship-treasuremap-deploy-docker.yaml | 2 +-
 tools/deployment/common/01_install_essentials.sh | 2 +-
 tools/gate/00_setup.sh                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/playbooks/airship-treasuremap-build-gate.yaml b/playbooks/airship-treasuremap-build-gate.yaml
index 9a3caecb5..142e8665b 100644
--- a/playbooks/airship-treasuremap-build-gate.yaml
+++ b/playbooks/airship-treasuremap-build-gate.yaml
@@ -30,7 +30,7 @@
 
     - name: docker install
       include_role:
-        name: docker-install
+        name: ensure-docker
 
     - name: install kustomize
       include_role:
diff --git a/playbooks/airship-treasuremap-deploy-docker.yaml b/playbooks/airship-treasuremap-deploy-docker.yaml
index 095b0b864..c10d91e57 100644
--- a/playbooks/airship-treasuremap-deploy-docker.yaml
+++ b/playbooks/airship-treasuremap-deploy-docker.yaml
@@ -12,4 +12,4 @@
 
 - hosts: all
   roles:
-    - docker-install
+    - ensure-docker
diff --git a/tools/deployment/common/01_install_essentials.sh b/tools/deployment/common/01_install_essentials.sh
index a366892af..a8a126761 100755
--- a/tools/deployment/common/01_install_essentials.sh
+++ b/tools/deployment/common/01_install_essentials.sh
@@ -20,7 +20,7 @@ pkg_check() {
   done
 }
 
-pkg_check software-properties-common curl wget ca-certificates docker.io make
+pkg_check software-properties-common curl wget ca-certificates make
 
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 
diff --git a/tools/gate/00_setup.sh b/tools/gate/00_setup.sh
index 0bc2d2fab..452a65270 100755
--- a/tools/gate/00_setup.sh
+++ b/tools/gate/00_setup.sh
@@ -35,7 +35,7 @@ envsubst <"${AIRSHIPCTL_WS}/tools/gate/config_template.yaml" > "$PLAYBOOK_CONFIG
 # use new version of ansible, Ubuntu has old one
 sudo apt update
 sudo DEBIAN_FRONTEND=noninteractive apt -y install software-properties-common python3-pip curl wget ca-certificates
-sudo DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install docker.io make
+sudo DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install make
 
 PACKAGES="ansible netaddr"
 if [[ -z "${http_proxy}" ]]; then