fixes (#145)

* fixes * mosabami-patch * mosabami-patch
Azure · Jul 20, 2024 · 3f5d461 · 3f5d461
1 parent 7aba4c3
commit 3f5d461
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
diff --git a/scenarios/aca-internal/bicep/modules/01-hub/README.md b/scenarios/aca-internal/bicep/modules/01-hub/README.md
@@ -36,7 +36,7 @@ Since this walkthrough is expected to be deployed isolated from existing infrast
    :stop_sign: Update this to your desired region.
 
    ```bash
-   LOCATION=northeurope # or any location that suits your needs
+   LOCATION=eastus # or any location that suits your needs, ensure Azure OpenAI service is available there.
    ```
 
 1. Create the regional network hub.

diff --git a/scenarios/aca-internal/bicep/modules/01-hub/deploy.hub.parameters.jsonc b/scenarios/aca-internal/bicep/modules/01-hub/deploy.hub.parameters.jsonc
@@ -25,6 +25,9 @@
     "enableBastion": {
       "value": true
     },
+    "spokeInfraSubnetAddressPrefix": {
+      "value":  "10.1.0.0/23"
+    },
     "gatewaySubnetAddressPrefix": {
       "value": "10.0.0.0/27"
     },

diff --git a/scenarios/aca-internal/bicep/modules/02-spoke/README.md b/scenarios/aca-internal/bicep/modules/02-spoke/README.md
@@ -20,13 +20,22 @@ After executing these steps you'll have the spoke resource group (`rg-lzaaca-spo
 - Jump box virtual machine (optional)
 
 ## Steps
+Note: If you are running these commands on windows, you might need to run the command below to ensure windows captures the RESOURCEID_VNET_HUB correctly:
+```bash
+export MSYS_NO_PATHCONV=1
+```
+
+az deployment sub delete \
+   -n acalza01-spokenetwork -g $RESOURCENAME_RESOURCEGROUP_SPOKE
 
 1. Create the regional spoke network.
 
    ```bash
    RESOURCEID_VNET_HUB=$(az deployment sub show -n acalza01-hub --query properties.outputs.hubVNetId.value -o tsv)
    echo RESOURCEID_VNET_HUB: $RESOURCEID_VNET_HUB
+   ```
 
+   ```bash
    # [This takes about two minutes to run.]
    az deployment sub create \
       -n acalza01-spokenetwork \

diff --git a/scenarios/aca-internal/bicep/modules/03-supporting-services/README.md b/scenarios/aca-internal/bicep/modules/03-supporting-services/README.md
@@ -31,7 +31,9 @@ By default, they are deployed to the spoke resource group.
    echo RESOURCENAME_RESOURCEGROUP_SPOKE: $RESOURCENAME_RESOURCEGROUP_SPOKE && \
    echo RESOURCEID_VNET_SPOKE: $RESOURCEID_VNET_SPOKE  && \
    echo LOG_ANALYTICS_WS_ID: $LOG_ANALYTICS_WS_ID
-
+   ```
+
+   ```bash
    # [This takes about four minutes to run (if you add deployRedis=false).]
    az deployment group create \
       -n acalza01-dependencies \

diff --git a/scenarios/aca-internal/bicep/modules/04-container-apps-environment/README.md b/scenarios/aca-internal/bicep/modules/04-container-apps-environment/README.md
@@ -30,7 +30,9 @@ The application platform, Azure Containers Apps, and its logging sinks within Az
    echo RESOURCENAME_RESOURCEGROUP_SPOKE: $RESOURCENAME_RESOURCEGROUP_SPOKE && \
    echo RESOURCENAME_VNET_SPOKE: $RESOURCENAME_VNET_SPOKE && \
    echo LOG_ANALYTICS_WS_ID: $LOG_ANALYTICS_WS_ID
-
+   ```
+
+   ```bash
    # [This takes about 11 minutes to run.]
    az deployment group create \
       -n acalza01-appplat \

diff --git a/scenarios/aca-internal/bicep/modules/05-hello-world-sample-app/README.md b/scenarios/aca-internal/bicep/modules/05-hello-world-sample-app/README.md
@@ -29,7 +29,8 @@ Public container registries are subject to faults such as outages or request thr
    echo RESOURCENAME_RESOURCEGROUP_SPOKE: $RESOURCENAME_RESOURCEGROUP_SPOKE && \
    echo RESOURCEID_IDENTITY_ACR: $RESOURCEID_IDENTITY_ACR && \
    echo RESOURCEID_ACA: $RESOURCEID_ACA
-
+   ```
+   ```bash
    # [This takes about one minute to run.] 
    az deployment group create \
       -n acalza01-helloworld \

diff --git a/scenarios/aca-internal/bicep/modules/06-application-gateway/README.md b/scenarios/aca-internal/bicep/modules/06-application-gateway/README.md
@@ -29,7 +29,9 @@ The "Hello World" container app is exposed through Application Gateway, includin
    echo FQDN_HELLOWORLD_ACA: $FQDN_HELLOWORLD_ACA && \
    echo RESOURCEID_KEYVAULT: $RESOURCEID_KEYVAULT  && \
    echo LOG_ANALYTICS_WS_ID: $LOG_ANALYTICS_WS_ID
-
+   ```
+
+   ```bash   
    # [This takes about six minutes to run.] 
    az deployment group create \
       -n acalza01-appgw \