From 845557224cf1926771614a9d6f2ffdb7917111c7 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Wed, 9 Feb 2022 16:35:20 +0000 Subject: [PATCH 1/4] GCP: Bolding for instructor. --- content/GCP/06_sharing_results.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/GCP/06_sharing_results.ipynb b/content/GCP/06_sharing_results.ipynb index 4537754..3c777dc 100644 --- a/content/GCP/06_sharing_results.ipynb +++ b/content/GCP/06_sharing_results.ipynb @@ -46,8 +46,8 @@ "source": [ "We will now add Members to a Bucket using the Web Console. We will use the Web Console to interactively build the policy binding by doing the following:\n", " * Navigation Menu -> **Storage/Cloud Storage** -> Browser -> Click on the Bucket Name (**Bucket Details**) -> Select the **Permissions** tab -> Click **Add** next to \"Permissions\" above the permissions list.\n", - " * In the \"New Principals\" box add the Identity for the collaborator (another individual) as directed by the instructor.\n", - " * Select the \"Storage Object Viewer\" by typing \"Storage Object Viewer\" in the filter and then selecting \"Storage Object Viewer\". Do not use any \"Legacy Storage\" roles.\n", + " * In the \"**New Principals**\" box add the Identity for the collaborator (another individual) as directed by the instructor.\n", + " * Select the \"**Storage Object Viewer**\" by typing \"Storage Object Viewer\" in the filter and then selecting \"Storage Object Viewer\". Do not use any \"Legacy Storage\" roles.\n", " * Click \"Save\" to save the policy.\n", " ![iam-storage-object-viewer](img/iam-storage-object-viewer.png)\n", " * Verify the policy is listed in the \"Permissions\" table on the \"Bucket Details\" page (you should now be on this page).\n", From 96a7508eb14b1f027aa719bf139b5e353dabcfd6 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Wed, 9 Feb 2022 21:41:55 +0000 Subject: [PATCH 2/4] GCP: Minor updates --- content/GCP/08_cleaning_up_resources.ipynb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/GCP/08_cleaning_up_resources.ipynb b/content/GCP/08_cleaning_up_resources.ipynb index 3880c63..7666d40 100644 --- a/content/GCP/08_cleaning_up_resources.ipynb +++ b/content/GCP/08_cleaning_up_resources.ipynb @@ -43,7 +43,7 @@ " * Try to delete the **VM Instance** on your own\n", "```\n", "\n", - "Navigate to the **Compute Engine** service and in the **VM Instances** page and remove the *VM Instance*.\n" + "Navigate to the **Compute Engine** service and in the **VM Instances** page and remove the *essentials* *VM Instance*.\n" ] }, { @@ -87,8 +87,8 @@ "\n", "To verify that the resources have been deleted do the following:\n", " * Navigate to the **VM Instances** page and **Cloud Storage** **Browser** to verify the resources have been deleted.\n", - " * Navigate to the **IAM & Admin** service and in the **Asset Inventory** page to verify that the resources have been deleted.\n", - " * Navigate to the **Activity** page and verify the deletion events. **Note:** the information collected in the asset inventory is often delayed.\n", + " * Navigate to the **IAM & Admin** service and in the **Asset Inventory** page to verify that the resources have been deleted. **Note:** the information collected in the asset inventory is often delayed.\n", + " * Navigate to the **Activity** page and verify the deletion events. \n", "\n", "```{admonition} Tip\n", ":class: tip\n", From a6abf2be39ab709ae79cdc0d8a3dce2e5f46c9b3 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Wed, 9 Feb 2022 17:11:46 -0600 Subject: [PATCH 3/4] VM dev setup instructions --- Build.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Build.md b/Build.md index 2a88a6d..cd47601 100644 --- a/Build.md +++ b/Build.md @@ -29,6 +29,19 @@ To publish to the `gh-pages` of the `origin` (or other) remote run. This copies the contents of `content/_build/html/` to `docs/` so GitHub Pages will render the document. GitHub pages should be set to the `gh-pages` and `docs/` folder. The script pushes a new branch overwriting the old branch and will not track changes. +## VM Development Setup + +Have your ~/.ssh/config source the file the *-create.sh scripts create. This is a one-time per machine setup. + +``` +echo "include ~/.ssh/essentials.config" >> ~/.ssh/config +``` + +Verify your name and email are correct (locally) as they are copied over to the VM +``` +git config user.name +git config user.email +``` ## GCP From bdd986b1b654b1e898be93d68827d6ce0f3b2612 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Thu, 10 Feb 2022 10:15:25 -0600 Subject: [PATCH 4/4] Azure: Dev env script updates (untested). --- scripts/azure-create.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/azure-create.sh b/scripts/azure-create.sh index fcbd3e5..08fddeb 100755 --- a/scripts/azure-create.sh +++ b/scripts/azure-create.sh @@ -21,26 +21,24 @@ echo "+++ creating resource group $RESOURCE_GROUP $SUBSCRIPTION" az group create --resource-group $RESOURCE_GROUP --location $LOCATION echo "+++ creating VM $VM" -# Ubuntu is "Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest" +# Ubuntu is "Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:latest" # Debian is "Debian:debian-10:10:latest" # Resource Group scope "subscriptions/$SUBSCRIPTION/resourceGroups/$RESOURCE_GROUP" az vm create --resource-group $RESOURCE_GROUP --name $VM \ - --image Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest \ + --image Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:latest \ --size Standard_D2_v4 \ - --storage-sku Standard_LRS \ + --storage-sku StandardSSD_LRS \ --public-ip-sku Standard \ --assign-identity \ --scope "subscriptions/$SUBSCRIPTION/resourceGroups/$RESOURCE_GROUP" \ + --role Contributor \ --admin-username $NAME +echo "+++ get IP for $VM" IP=$(az vm show --name $VM --resource-group $RESOURCE_GROUP -d --query publicIps -otsv) -IDENTITY=$(az vm show --name $VM --resource-group $RESOURCE_GROUP --query identity.principalId -otsv) - -echo "+++ assign the VM the Contributor role to the subscription ($IDENTITY to $SUBSCRIPTION)" -az role assignment create --assignee $IDENTITY --scope /subscriptions/$SUBSCRIPTION --role Contributor echo "+++ wait for boot and cloud-init ${VM} ${IP}" -ssh-keygen -R $IP +ssh-keygen -R "$IP" while ! ssh $NAME@$IP sudo cloud-init status --wait ; do sleep 1 done