local SSD provision: use a single install command

pingcap · Jun 21, 2019 · 710bcd2 · 710bcd2
1 parent a1815fe
commit 710bcd2
Showing 1 changed file with 6 additions and 13 deletions.
diff --git 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