11079 Merging latest content changes

timesten/cache-introduction/00-setup-compute/setup-compute.md

@@ -21,7 +21,7 @@ For more information about Terraform and Resource Manager, please see the append
 This lab assumes you have:
 
 - An Oracle Cloud account (paid or free trial)
-- You have completed *Lab: Prepare Setup* 
+- Completed *Lab: Prepare Setup* 
 
 ## Task 1: Create Stack: Choose a Path
 
@@ -91,26 +91,6 @@ In the prior steps we elected to trigger the *terraform apply action* on stack c
 2.  Congratulations, your environment has been created!  Click on the *Application Information* tab to get additional information about what you have just done.
 3.  Your public IP address(es), instance name(s), and remote desktop URL are displayed.
 
-
-## Task 4: Access the Graphical Remote Desktop
-For ease of execution of this workshop, your VM instance has been pre-configured with a remote graphical desktop accessible using any modern browser on your laptop or workstation. Proceed as detailed below to login.
-
-1. Navigate to **Stack Details**, **Application Information** tab, and click on the remote desktop URL
-
-  ![](./images/create-stack-novnc-10.png " ")
-
-  ![](./images/novnc-login-1.png " ")
-
-  This should take you directly to your remote desktop in a single click.
-
-  ![](images/novnc-launch-get-started-2.png " ")
-
-    *Note:* While rare, you may see an error on the browser - “*Deceptive Site Ahead*” or similar depending on your browser type as shown below.
-
-    Public IP addresses used for LiveLabs provisioning comes from a pool of reusable addresses and this error is due to the fact that the address was previously used by a compute instance long terminated, but that wasn't properly secured, got bridged and was flagged. You can safely ignore and proceed by clicking on *Details*, and finally on *Visit this unsafe site*.
-
-  ![](images/novnc-deceptive-site-error.png " ")
-
 You can now *proceed to the next lab*.
 
 ## Appendix 1:  Terraform and Resource Manager

timesten/cache-introduction/00-verify-compute/verify-compute-desktop.md

@@ -0,0 +1,126 @@
+# Connect to the workshop compute instance
+
+## Introduction
+This lab will show you how to login to your pre-created compute instance running on Oracle Cloud.
+
+**Estimated Lab Time:** 10 minutes
+
+### Objectives
+In this lab, you will:
+
+- Learn how to connect to your compute instance using the NoVNC Remote Desktop
+- Learn the basics of using the NoVNC Desktop, including copy and paste
+- Configure and use SSH access to the compute instance (optional)
+
+### Prerequisites
+
+This lab assumes:
+
+- You have successfully provisioned a workshop compute instance either in the LiveLabs sandbix or in your own tenancy
+- If you using the LiveLabs sandbox, and you wish to use SSH to access the compute instance, that you have an RSA format SSH private/public key pair to use to access the compute instance (optional)
+
+If you wish to use the NoVNC graphical desktop to access the workshop compute instance, please complete **tasks 1 and 2** below.
+
+If you prefer to use SSH to access the compute instance, please complete **task 3** below.
+
+If you wish to be able to use both connection methods, please complete all the tasks in this lab.
+
+**IMPORTANT:** Due to the slightly cumbersome nature of copying between your host system and the NoVNC session, we recommend that you perform all of the copy/paste actions within the NoVNC session itself, as this avoids the use of the NoVNC clipboard. Alternatively, access the workshop's compute instance via SSH and copy/paste between the lab instructions displayed in your local browser and your SSH session.
+
+## Task 1: Enable NoVNC Full-screen Display
+
+Too make the best use of your display, perform the following tasks to render your remote desktop session in fullscreen mode.
+
+1. Click on the small gray tab on the middle-left side of your screen to open the control bar.
+
+    ![](./images/novnc-fullscreen-1.png " ")
+
+2. Select *Fullscreen* to render the session on your entire screen.
+
+    ![](./images/novnc-fullscreen-2.png " ")
+    ![](./images/novnc-fullscreen-3.png " ")
+
+## Task 2: Enable Copy/Paste from Local to Remote Desktop
+
+During the execution of this workshop you may will to copy text from your local PC/Mac to the remote desktop, such as commands from the lab guide. While such direct copy/paste isn't supported, you may proceed as indicated below to enable an alternative local-to-remote clipboard via the NoVNC Clipboard.
+
+1. Continuing from the last task above, Select the *clipboard* icon
+
+    ![](./images/novnc-clipboard-1.png " ")
+
+2. Copy some text from your local computer as illustrated below and paste into the clipboard widget, then finally open up the desired application (e.g. Terminal) and paste accordingly using *mouse controls*
+
+    ![](./images/novnc-clipboard-2.png " ")
+
+*Note:* Please make sure you initialize your clipboard with step [1] shown in the screenshot above before opening the target application in which you intend to paste the text. Otherwise will find the *paste* function in the context menu grayed out when attempting to paste for the first time.
+
+If you will be using the NoVNC desktop for the workshop, make sure that you have an open terminal session. If you have closed the terminal session that was open when you first logged in, open a new one now using **Activities > Terminal** from the Linux desktop menu bar. 
+
+## Task 3: Configure and use SSH access (optional)
+
+While your workshop can be executed end-to-end from the remote desktop, follow the steps provided below if you prefer to access the instance remotely using an SSH client such as Putty, Unix/Linux/MacOS Terminal, OCI cloudshell, and other terminal emulators available on Windows.
+
+**IMPORTANT:** If you are running the workshop instance in your own tenancy and you configured SSH access as part of deploying the instance via the ORM stack, skip straight to step **7** below.
+
+*Note:* In this section you are enabling SSH access to the OS user running the remote desktop, which for this workshop is the **oracle** user.
+
+This assumes that you already have an RSA type SSH key-pair available on the local system where you will be connecting from. If you don't, then for more info on creating and using SSH keys for your specific platform and client, please refer to the guide [Generate SSH Keys](https://docs.oracle.com/en/learn/generate_ssh_keys/index.html)
+
+1. Open the remote clipboard on the remote desktop as shown in *Task 3* and launch a terminal session
+
+2. Paste the block below onto the remote clipboard first, then onto the terminal to create or update the file *$HOME/.ssh/authorized_keys* using the *vi* editor
+
+    ```
+    <copy>
+    cd $HOME/.ssh
+    vi authorized_keys
+    </copy>
+    ```
+
+    ![](./images/novnc-copy-pub-key-4.png " ")
+
+    Enter append mode in vi (type **A**), and start a new line if required.
+
+3. From the local system (e.g. your laptop), with the exception of *Putty* users, locate the SSH _public_ key from your key-pair, open it, and copy the entire content to the clipboard.
+
+    ![](./images/novnc-copy-pub-key-1.png " ")
+
+    If using *Putty* you must load the private key (*.ppk*) into *Puttygen* utility to see the relevant public key block to copy. Do not copy the content of the public key file directly as it will not work.
+
+    ![](./images/novnc-copy-pub-key-2.png " ")
+
+4. Paste the copied public key into the remote clipboard first, then into the terminal where you opened the *authorized_keys* file for editing.
+
+    ![](./images/novnc-copy-pub-key-3.png " ")
+
+5. Save and exit the *vi* editor (press the **Escape** key then type **ZZ**)
+
+6. Set the required permissions on *authorized_keys*
+
+    ```
+    <copy>
+    chmod 0600 authorized_keys
+    </copy>
+    ```
+
+7. Verify SSH connectivity using the private key (for Unix/Linux/MacOS Terminal, OCI cloudshell, and Terminal emulators on Windows such as Cygwin and MobaXterm).
+
+    ```
+    ssh -i [path to private key] remote-user@[instance-public-ip-address]
+    e.g.
+    <copy>
+    ssh -i ~/.ssh/livelabs_rsa oracle@150.136.123.105
+    </copy>
+    ```
+
+    For Putty, please refer to the guide [Generate SSH Keys](https://oracle-livelabs.github.io/common/labs/generate-ssh-key) on how to establish the connection using the *.ppk* private key.
+
+You should now have an open terminal session in the compute instance, either via the NoVNC desktop or via SSH. Keep this session open for the next lab.
+
+You may now *proceed to the next lab*.
+
+
+## Acknowledgements
+* **Author** - Rene Fontcha, LiveLabs Platform Lead, NA Technology
+* **Contributors** - LiveLabs Team
+* **Last Updated By/Date** - Chris Jenkins, August 2022