airship
/
treasuremap
Code Issues Proposed changes

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
This commit is contained in:
Sreejith Punnapuzha 2021-11-04 15:25:51 +00:00
parent e55e960caf
commit 5afbb354d5
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/airship-treasuremap-build-gate.yaml
View File

@ -30,7 +30,7 @@
- name: docker install - name: docker install
include_role: include_role:
name: docker-install name: ensure-docker
- name: install kustomize - name: install kustomize
include_role: include_role:

2
playbooks/airship-treasuremap-deploy-docker.yaml
View File

@ -12,4 +12,4 @@
- hosts: all - hosts: all
roles: roles:
- docker-install - ensure-docker

2
tools/deployment/common/01_install_essentials.sh
View File

@ -20,7 +20,7 @@ pkg_check() {
done 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"} : ${AIRSHIPCTL_PROJECT:="../airshipctl"}

2
tools/gate/00_setup.sh
View File

@ -35,7 +35,7 @@ envsubst <"${AIRSHIPCTL_WS}/tools/gate/config_template.yaml" > "$PLAYBOOK_CONFIG
# use new version of ansible, Ubuntu has old one # use new version of ansible, Ubuntu has old one
sudo apt update 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 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" PACKAGES="ansible netaddr"
if [[ -z "${http_proxy}" ]]; then if [[ -z "${http_proxy}" ]]; then