You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: v2024.3.0/connect-container-to-oci-tenancy/index.html
+17-25Lines changed: 17 additions & 25 deletions
Original file line number
Diff line number
Diff line change
@@ -2149,8 +2149,8 @@ <h1 id="connect-container-to-oci-tenancy"><strong>Connect container to OCI Tenan
2149
2149
<divclass="admonition note">
2150
2150
<pclass="admonition-title">Note</p>
2151
2151
<ul>
2152
-
<li>With the toolkit release v2024.1.0, the toolkit supports only a single <strong>prefix</strong> per container when using Jenkins.</li>
2153
-
<li>When a new region is subscribed to the tenancy, rerun createTenancyConfig.py by using the same tenancyconfig.properties file that was originally used. It will create new directory for the new region under <code>/cd3user/tenancies/<prefix>/terraform_files</code> without touching the existing ones and will commit the latest terraform_files folder to DevOps GIT repo.</li>
2152
+
<li>With the toolkit release v2024.1.0, the toolkit supports only a single <strong>customer_name</strong> per container when using Jenkins.</li>
2153
+
<li>When a new region is subscribed to the tenancy, rerun createTenancyConfig.py by using the same tenancyconfig.properties file that was originally used. It will create new directory for the new region under <code>/cd3user/tenancies/<customer_name>/terraform_files</code> without touching the existing ones and will commit the latest terraform_files folder to DevOps GIT repo.</li>
2154
2154
</ul>
2155
2155
</div>
2156
2156
<p><strong>Step 1 - Login (Exec) into the Container</strong>:</p>
@@ -2182,7 +2182,7 @@ <h1 id="connect-container-to-oci-tenancy"><strong>Connect container to OCI Tenan
2182
2182
<th>Example</th>
2183
2183
</tr>
2184
2184
<tr>
2185
-
<td>prefix</td>
2185
+
<td>customer_name</td>
2186
2186
<td>Friendly name for the Customer Tenancy</td>
2187
2187
<td>demo</td>
2188
2188
</tr>
@@ -2221,17 +2221,10 @@ <h1 id="connect-container-to-oci-tenancy"><strong>Connect container to OCI Tenan
2221
2221
<td>The outdir_structure_file defines the grouping of the terraform auto.tf.vars for the various generated resources.To group resources into different directories within each region - specify the absolute path to the file.To have all the files generated in a single directory in the corresponding region, leave this variable blank.</td>
2222
2222
<td>Defaults to /cd3user/oci_tools/cd3_automation_toolkit/user-scripts/outdir_structure_file.properties</td>
2223
2223
</tr>
2224
-
2225
-
<tr>
2226
-
<td>tf_or_tofu</td>
2227
-
<td>IaC Tool to be configured - Terraform or OpenTofu</td>
2228
-
<td>terraform</td>
2229
-
</tr>
2230
-
<tr>
2231
2224
<tr>
2232
2225
<td>ssh_public_key</td>
2233
2226
<td>SSH Key for launched instances; Use '\n' as the delimiter to add multiple ssh keys.</td>
@@ -2256,7 +2249,7 @@ <h1 id="connect-container-to-oci-tenancy"><strong>Connect container to OCI Tenan
2256
2249
</tr>
2257
2250
<tr>
2258
2251
<td>remote_state_bucket_name</td>
2259
-
<td>Specify bucket name if you want to use existing bucket else leave empty.If left empty, Bucket with name ${prefix}-automation-toolkit-bucket will be created/reused in ${region}.</td>
2252
+
<td>Specify bucket name if you want to use existing bucket else leave empty.If left empty, Bucket with name ${customer_name}-automation-toolkit-bucket will be created/reused in ${region}.</td>
2260
2253
<td>demo_bucket</td>
2261
2254
</tr>
2262
2255
<tr>
@@ -2266,7 +2259,7 @@ <h1 id="connect-container-to-oci-tenancy"><strong>Connect container to OCI Tenan
2266
2259
</tr>
2267
2260
<tr>
2268
2261
<td>oci_devops_git_repo_name</td>
2269
-
<td>Specify Repo name if you want to use existing OCI Devops GIT Repository else leave empty Format: <project_name/repo_name\>. If left empty, DevOps items with names <b>${prefix}-automation-toolkit-project/repo/topic</b> will be created/reused in ${region}.</td>
2262
+
<td>Specify Repo name if you want to use existing OCI Devops GIT Repository else leave empty Format: <project_name/repo_name\>. If left empty, DevOps items with names <b>${customer_name}-automation-toolkit-project/repo/topic</b> will be created/reused in ${region}.</td>
2270
2263
<td>demo_repo</td>
2271
2264
</tr>
2272
2265
<tr>
@@ -2280,7 +2273,7 @@ <h1 id="connect-container-to-oci-tenancy"><strong>Connect container to OCI Tenan
2280
2273
</tr>
2281
2274
<tr>
2282
2275
<td>oci_devops_git_key</td>
2283
-
<td>When left empty, same key file from $(key_path) used for $(auth_mechanism) as api_key will be copied to <b>/cd3user/tenancies/<prefix>/</b> and used for GIT Operations. Make sure the api key file permissions are rw(600) for cd3user</td>
2276
+
<td>When left empty, same key file from $(key_path) used for $(auth_mechanism) as api_key will be copied to <b>/cd3user/tenancies/<customer_name>/</b> and used for GIT Operations. Make sure the api key file permissions are rw(600) for cd3user</td>
@@ -2292,7 +2285,6 @@ <h1 id="connect-container-to-oci-tenancy"><strong>Connect container to OCI Tenan
2292
2285
<pclass="admonition-title">Important</p>
2293
2286
<ul>
2294
2287
<li>Have the details ready for Authentication mechanism you are planning to use.<br></li>
2295
-
<li>Choose whether the outdir needs to be configured with OpenTofu or Terraform. Its a one time selection for that prefix and cannot be modified later.<br></li>
2296
2288
<li>Review <strong>outdir_structure_file</strong> parameter as per requirements. It is recommended to use separate outdir structure to manage a large number of resources. <br></li>
2297
2289
<li>Review Advanced Parameters Section for CI/CD setup. <strong>The toolkit can be used either with CLI or with Jenkins.</strong> If you plan to use the toolkit with Jenkins then be ready with user details that will be used to connect to DevOps Repo in OCI. Specifying these parameters as <strong>'yes'</strong> in properties file will create Object Storage Bucket and Devops Git Repo/Project/Topic in OCI and enable toolkit usage with Jenkins. The toolkit supports users in primary IDCS stripes or default domains only for DevOps GIT operations.<br></li>
2298
2290
</ul>
@@ -2327,49 +2319,49 @@ <h1 id="connect-container-to-oci-tenancy"><strong>Connect container to OCI Tenan
<td>Customer Specific properties file for outdir structure.
2337
2329
This file will not be generated if 'outdir_structure_file' parameter was set to empty(single outdir)in tenancyconfig.properties while running createTenancyConfig.py</td>
<td>This file contains access key and secret for S3 compatible OSbucket to manage remote terraform state. This is generated only if use_remote_state is set to yes</td>
2374
2366
</tr>
2375
2367
<tr>
@@ -2379,7 +2371,7 @@ <h1 id="connect-container-to-oci-tenancy"><strong>Connect container to OCI Tenan
<td>The input properties file used to execute the script is copied to custome folder to retain for future reference. This can be used when the script needs tobe re-run with same parameters at later stage.</td>
0 commit comments