Skip to content

Commit 20945b1

Browse files
authored
Wms id 11643 eli edits (oracle-livelabs#416)
* Minor fixes * Clean-up of a few minor typos.
1 parent 106c29b commit 20945b1

File tree

4 files changed

+12
-31
lines changed

4 files changed

+12
-31
lines changed

oci-pulumi-self-service/livelabs/ocw24-livelabs/01-prepare-tenancy/prepare.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,7 @@ To simplify the remaining steps in the workshop, we recommend using an OCI comup
164164
165165
>Note: You can copy the entire block of commands and paste it in your terminal. You might be prompted a few times to press enter to accept the defaults, or type `Y` to agree.
166166
167-
4. Restart the shell session.
168-
169-
```bash
170-
<copy>
171-
source ~/.profile
172-
</copy>
173-
```
167+
4. Part of the code block above alters the permissions for the Ubuntu user. To instantiate the changes, you must exit and reconnect to your SSH session.
174168
175169
>Note: The best way to check permissions is to run `docker ps` - if you get an error, you'll need to disconnect from the server, then reconnect (to fully recycle your user session)
176170

oci-pulumi-self-service/livelabs/ocw24-livelabs/02-deploy-infra/deploy-infra.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Estimated time: 20 minutes
5050
For more information, please visit the project page: https://www.pulumi.com/docs/
5151
```
5252

53-
## Create a Python virtual environment and install the Pulumi OCI provider
53+
## Task 2: Create a Python virtual environment and install the Pulumi OCI provider
5454

5555
1. Create a new Python virtual environment with Python 3.10
5656

@@ -105,7 +105,7 @@ Estimated time: 20 minutes
105105

106106
4. Provide a name the stack (e.g. OCW-2024) and press enter.
107107

108-
## Task 2: Build out your Pulumi project
108+
## Task 3: Build out your Pulumi project
109109

110110
1. Now that you have a Pulumi stack, you'll need to provide some environment configuration details. Copy the commands below to a text file and replace the `<placeholder>` values with the data you gathered in lab 1.
111111
@@ -180,7 +180,7 @@ Estimated time: 20 minutes
180180
181181
![View the Backstage dashboard](images/backstage-dashboard.png)
182182
183-
## Task 3: Create a new Pulumi Environment
183+
## Task 4: Create a new Pulumi Environment
184184
Pulumi environments, secrets, and configuration - or ESC for short - enables teams to centralize secrets and configuration data in a central repository. ESC is intended to provide frictionless security, improve developer efficiency, enhance compliance, and mitigate sprawl. On top of that, ESC easiliy integrates with a variety of platforms, making it a cinch to add to your IaC efforts.
185185
186186
1. Return to the app.pulumi.com portal, making sure you're logged in, and click **Environments** on the left navigation menu.
@@ -202,11 +202,11 @@ Pulumi environments, secrets, and configuration - or ESC for short - enables tea
202202
oracle:
203203
default:
204204
userOcid: <you user OCID here>>
205-
fingerprint: <your API key fingerprint here>>
206-
tenancyOcid: <your tenancy OCID here>
207-
region: <your selected region here>
208-
privateKey:
209-
fn::secret: "<paste API private key contents here>"
205+
fingerprint: <your API key fingerprint here>>
206+
tenancyOcid: <your tenancy OCID here>
207+
region: <your selected region here>
208+
privateKey:
209+
fn::secret: "<paste API private key contents here>"
210210
# Configuration nested under the "pulumiConfig" key will be available to Pulumi stacks that
211211
# reference this Environment during `pulumi up/preview/refresh/destroy`
212212
pulumiConfig:
@@ -218,7 +218,7 @@ Pulumi environments, secrets, and configuration - or ESC for short - enables tea
218218
</copy>
219219
```
220220

221-
>Note: Your pasted values should look something like this:
221+
>Note: Your pasted values should look something like the following. You may need to indent the contents of your API key to align with `fn::secret` as shown below:
222222

223223
```bash
224224
# values is a required top-level key

oci-pulumi-self-service/livelabs/ocw24-livelabs/03-first-template/first-template.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,9 @@ Estimated time: 20 minutes
3030
3131
4. Click **`[NEXT]`** and fill in the Pulumi template details.
3232

33-
* **Organization** - Enter somethign like, "Workshop"
33+
* **Organization** - This is your Pulumi organization name. More than likely, it is the same as your Pulumi ID
3434
* **Pulumi ESC** - **`oci-pulumi-self-service`**
35-
* **Select stack** - Pick one [Development | QA | Production]
36-
* **Website content** - Copy and paste the following:
37-
38-
```
39-
<copy>
40-
<html>
41-
<head>
42-
<title>OCI + Pulumi + Backstage = Self Service Portal</title>
43-
<h1>Well done - your first template deployment!</h1>
44-
</head>
45-
</html>
46-
</copy>
47-
```
35+
* **Select stack** - Pick one [Oracle-CloudWorld2024 | Development | QA | Production]
4836

4937
5. Click **`[NEXT]`** and fill in the Repository Location (where Backstage will store your output code).
5038

oci-pulumi-self-service/livelabs/ocw24-livelabs/04-oke-template/oke-template.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ In this lab you will register additional templates from a Github repository, the
5656

5757
2. Given the addition of two entities in the first task, we can now track component ownership. As you provision additional components related to particular groups, it is easy to explore the relationships between the different entities.
5858

59-
3.
6059

6160
You may now **proceed to the next lab**.
6261

0 commit comments

Comments
 (0)