Merge pull request #764 from PureStorage-OpenConnect/dudeaccelerate

Dudeaccelerate

Author: danpaul81

assets/dude/ui.sh

@@ -1,9 +1,11 @@
 if [ $UID -gt 1000 ]; then
   n=$(echo $USER | sed s/training//)
   [ $[2*$[$n/2]] -ne $n ] && n=$[$n+1]
-  ADMIN_PW=$(kubectl --kubeconfig /tmp/kubeconfig.$n get secret pxcentral-keycloak-http -n central -o jsonpath="{.data.password}" | base64 --decode)
-  PXB_URL=$(kubectl --kubeconfig /tmp/kubeconfig.$n get svc px-backup-ui -n central -o=jsonpath='{.status.loadBalancer.ingress[0].hostname}')
+  ADMIN_PW=$(kubectl --kubeconfig /home/training$n/.kube/config get secret pxcentral-keycloak-http -n central -o jsonpath="{.data.password}" | base64 --decode)
+  PXB_URL=$(kubectl --kubeconfig /home/training$n/.kube/config get svc px-backup-ui -n central -o=jsonpath='{.status.loadBalancer.ingress[0].hostname}')
+  echo +==============================================================================+
   echo Portworx Backup UI: http://$PXB_URL/
   echo Portworx Backup username: admin
   echo Portworx Backup password: $ADMIN_PW
+  echo +==============================================================================+
 fi

scripts/dude

@@ -1,15 +1,12 @@
 install_backup() {
-  px pxb create cloudcredential --name aws-credential --provider aws --aws-access-key $AWS_ACCESS_KEY --aws-secret-key $AWS_SECRET_KEY
+  px pxb create cloudcredential --name aws-credential --provider aws --aws-access-key $aws_access_key_id --aws-secret-key $aws_secret_access_key
   px pxb create backuplocation --name s3 --provider s3 --path $BACKUP_BUCKET --cloud-credential-name aws-credential --s3-endpoint s3.amazonaws.com --s3-region $aws_region
   px pxb create schedulepolicy --name 15min-schedule --interval-minutes 15 --interval-retain 12
   PXB_URL=$(kubectl get svc px-backup-ui -n central -o=jsonpath='{.status.loadBalancer.ingress[0].hostname}')
   scp /etc/motd master-$[$cluster-1]:/etc/motd
 }
 
 install_dr() {
-  AWS_ACCESS_KEY=$(sed -n 's/aws_access_key_id[ =]*//p' /root/.aws/credentials 2>/dev/null | head -1)
-  AWS_SECRET_KEY=$(sed -n 's/aws_secret_access_key[ =]*//p' /root/.aws/credentials 2>/dev/null | head -1)
-
   echo "Creating bucket '$DR_BUCKET' in region 'us-east-1', if it does not exist"
   aws s3 mb s3://$DR_BUCKET --region us-east-1
   BUCKET_REGION=$(aws s3api get-bucket-location --bucket $DR_BUCKET --output text)
@@ -23,8 +20,7 @@ install_dr() {
   echo Mode is $MODE
 
   while : ; do
-    scp master-$[$cluster+1]:/root/.kube/config /tmp/dest_kubeconfig
-    storkctl create clusterpair remotecluster --namespace kube-system $LOCAL_EP $REMOTE_EP --dest-kube-file /tmp/dest_kubeconfig --src-kube-file /root/.kube/config --provider s3 --s3-endpoint s3.amazonaws.com --s3-access-key $AWS_ACCESS_KEY --s3-secret-key $AWS_SECRET_KEY --s3-region $BUCKET_REGION  --bucket $DR_BUCKET --mode $MODE && break
+    storkctl create clusterpair remotecluster --namespace kube-system $LOCAL_EP $REMOTE_EP --dest-kube-file /tmp/kubeconfig.$[$cluster+1] --src-kube-file /root/.kube/config --provider s3 --s3-endpoint s3.amazonaws.com --s3-access-key $aws_access_key_id --s3-secret-key $aws_secret_access_key --s3-region $BUCKET_REGION  --bucket $DR_BUCKET --mode $MODE && break
     sleep 5
   done
 
@@ -38,6 +34,13 @@ if [ $cluster -eq 1 ]; then
   cp /assets/dude/bashrc /etc/skel/.bashrc
   for i in $(seq 1 $clusters); do
     useradd training$i
+  done
+  for i in $(seq 1 $clusters); do
+    if [ $[2*$[$i/2]] -eq $i ]; then
+      groupmod -a -U training$[$i-1] training$i
+    else
+      groupmod -a -U training$[$i+1] training$i
+    fi
     passwd --stdin training$i <<<portworx
     scp master-$i:/root/.kube/config /tmp/kubeconfig.$i
     install -o training$i -g training$i /tmp/kubeconfig.$i /home/training$i/.kube/config

scripts/helm-backup-postinstall

@@ -22,7 +22,7 @@ fi
 
 cat <<EOF >> /etc/motd
 +================================================+
-SAVE THE FOLLOWING DETAILS FOR FUTURE REFERENCES
+SAVE THE FOLLOWING DETAILS FOR FUTURE REFERENCE
 +================================================+
 PX-Central User Interface Access URL : http://$PXB_URL
 PX-Central admin user name: admin