From 710bcd2f0f263a2c32c8f51d5af12b1bd74659e9 Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Fri, 21 Jun 2019 06:17:21 -0700 Subject: [PATCH] local SSD provision: use a single install command --- .../local-ssd-provision.yaml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/manifests/gke/local-ssd-provision/local-ssd-provision.yaml b/manifests/gke/local-ssd-provision/local-ssd-provision.yaml index 9d197a4c21..347f58ee18 100644 --- a/manifests/gke/local-ssd-provision/local-ssd-provision.yaml +++ b/manifests/gke/local-ssd-provision/local-ssd-provision.yaml @@ -58,22 +58,15 @@ spec: # Install the linux guest environment tools export DEBIAN_FRONTEND=noninteractive - cat /etc/apt/sources.list + # Fix any issues dpkg --configure -a - apt-get update - apt-get install -y software-properties-common || echo "could not install software-properties-common" + apt-get -y autoremove + # Add universe repository + apt-get install -y software-properties-common || apt-get update && apt-get install -y software-properties-common apt-add-repository universe + # Install required packages apt-get update - declare -a PKG_LIST=(python-google-compute-engine \ - python3-google-compute-engine \ - google-compute-engine-oslogin \ - gce-compute-image-packages) - for pkg in ${PKG_LIST[@]}; do - apt-get install -y $pkg || echo "Not available: $pkg" - done - - apt-get install -y lvm2 - apt-get -y autoremove + apt-get install -y lvm2 python-google-compute-engine python3-google-compute-engine google-compute-engine-oslogin gce-compute-image-packages set -x if ! findmnt -n -a -l | grep /mnt/disks/ssd ; then