Skip to content

Commit f3b711d

Browse files
committed
fix: add workaround for unique watson project name
1 parent a3d8f51 commit f3b711d

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ Click the "Add to project" button, and select create in new project.
1010

1111
## 2. Prereqs in target account
1212

13-
- Create an API key in the target account. Keep note of it. Give it admin privilege for now ( will be narrowed down in future version )
14-
- Create a resource group in the target account (this steps is temporary in current alpha version).
13+
- Create an API key in the target account. Keep note of it. Give it admin privilege for now. Exact permissions will be narrowed down in future version.
14+
- Create a resource group in the target account. This steps is temporary in current alpha version - resource groups will be created in the base account DA in future versions.
1515

1616

1717
## 3. Set the input configuration for the stack
1818

19-
- Clone this repository locally
20-
- Create a file with name ".def.json" with the following content. Ensure region is either us-south or eu-de (watsonx limitation for now)
19+
- Clone this repository locally - and checkout the dev branch.
20+
- Create a file with name ".def.json" with the following content. Important: ensure region is either us-south or eu-de as watsonx can only be deployed in those 2 locations for now.
2121

2222
```json
2323
{
@@ -28,7 +28,8 @@ Click the "Add to project" button, and select create in new project.
2828
"region": "<region where resources are deployed>",
2929
"sample_app_git_url": "https://github.com/IBM/gen-ai-rag-watsonx-sample-application"
3030
}
31-
}```
31+
}
32+
```
3233

3334
Example:
3435
```json
@@ -45,11 +46,9 @@ Example:
4546

4647
## 4. Get the configuration ids for each element of the stack
4748

48-
Run `ibmcloud project configs --project-id <project_id>`
49-
50-
Project id is the id of the project created in step 1. The id can be found under the Manage -> Details tab in the project.
51-
52-
Take note the id of each config.
49+
Run `ibmcloud project configs --project-id <project_id>` to get the list of configurations in the project.
50+
- Project id is the id of the project created in step 1. The project id can be found under the Manage -> Details tab in the project UI.
51+
- Take note the id of each config. The first config is the "stack" config.
5352

5453
## 5. Edit your local copy of deploy-many.sh
5554

@@ -59,10 +58,12 @@ In deploy-many.sh:
5958
CONFIG_IDS=("9618c574-4e0d-4e89-ac55-440717c8b378" "545c1a92-fa21-447f-96ed-fbefb7c50b35" "9aca1cae-36e3-4d1a-96fe-a4ddec057c01" "3eab3b42-f8d4-4532-b0d2-05ef2cc9c250" "b3dbe0de-1512-4351-b0f5-bb8ae8be4d4b")
6059
- Set STACK_CONFIG_ID to the id of the config corresponding to the stack
6160

61+
Tips: to accelerate iteration you may deploy only a subset of the configurations: the bare minimum are key management, security manager, watson saas, alm and rag configuration da. Base account, observability and SCC are not on the critical path to get the app running.
6262

6363
## 6. Run ./deploy-many.sh
6464

6565
- Ensure you are login using ibmcloud login --sso
6666
- Execute ./deploy-many.sh
6767

68+
Tips: If deployment fail in one of the DA, you may need to remove the configuration id of the deployment that already passes before re-running the script.
6869

deploy-many.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ set -x
44

55

66

7-
PROJECT_ID="f24554c3-a402-48c6-9293-12ebd066baa1"
8-
CONFIG_IDS=("91d1f479-b586-49c0-a696-a261550c8125" "6b74f33f-a9ea-421a-b18f-1de7b55c21bb")
9-
STACK_CONFIG_ID="9f66a3df-9717-41c2-8380-347e641f817d"
7+
PROJECT_ID="546993cb-c1ba-49cd-a975-187a2b924c21"
8+
CONFIG_IDS=("b79d03d5-edfe-4cd4-8787-7d70738c6529" "853c369d-3dbd-41e4-8e79-006d2c3408b2" "736fd03d-190a-4bcd-a1a5-18334d868f20" "3d76faf5-663e-4a7a-bb1d-3c98a9fa6628" "70667b97-6bb5-425b-8e6a-47c931740604")
9+
STACK_CONFIG_ID="53ef9a25-3aad-4167-b548-41b19c57cad4"
1010

1111
function set_stack_inputs() {
1212
ibmcloud project config-update --project-id $PROJECT_ID --id $STACK_CONFIG_ID --definition @.def.json

stack_definition.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@
202202
{
203203
"name": "watson_governance_plan",
204204
"value": "do not install"
205+
},
206+
{
207+
"name": "project_name",
208+
"value": "ref:../../inputs/prefix"
205209
}
206210
],
207211
"name": "4 - WatsonX SaaS services",

0 commit comments

Comments
 (0)