Skip to content

[patch] Require RSL secret name as API parameter #1742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 171 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
171 commits
Select commit Hold shift + click to select a range
1535548
[patch] add kmodel api call to playbook
karol-czarnecki Nov 4, 2024
512cd4b
[patch] fix linter errors
karol-czarnecki Nov 5, 2024
e58cb95
[patch] add domain for KMODEL API
karol-czarnecki Nov 5, 2024
8175177
[patch] add python scripts
karol-czarnecki Nov 5, 2024
10059d6
[patch] remove whitespace
karol-czarnecki Nov 5, 2024
93dc3a8
[patch] add python script for create tenant
karol-czarnecki Nov 5, 2024
6a90b90
[patch] remove not used string
karol-czarnecki Nov 5, 2024
e56a356
[patch] remove commented out connection
karol-czarnecki Nov 5, 2024
2ac09a6
[patch] fix conn string
karol-czarnecki Nov 5, 2024
a298227
[patch] fix python scripts
karol-czarnecki Nov 5, 2024
4e7ec2e
[patch] use api instead pyrhon scripts
karol-czarnecki Nov 7, 2024
1625213
[patch] update code logic
karol-czarnecki Nov 8, 2024
32b224b
[patch] add is saas
karol-czarnecki Nov 8, 2024
5d71024
[patch] add condition to run when saas
karol-czarnecki Nov 8, 2024
24ce196
[patch] rename saas variable
karol-czarnecki Nov 8, 2024
83bc521
[patch] remove whitespaces
karol-czarnecki Nov 8, 2024
82733a4
[patch] add script to create sls and dro secret
karol-czarnecki Nov 11, 2024
28ce4d8
[patch] fix whitespace
karol-czarnecki Nov 11, 2024
064b255
[patch] update script for create SLS secret
karol-czarnecki Nov 11, 2024
2e47ede
[patch] added missing env to script for create DRO secret
karol-czarnecki Nov 11, 2024
3c414fd
[patch] add condition to check if secret exists
karol-czarnecki Nov 11, 2024
6c647c5
[patch] add RBAC for patch jobs/cronjobs
karol-czarnecki Nov 12, 2024
d2d8f5b
[patch] add patch to jobs/cronjobs in RBAC
karol-czarnecki Nov 12, 2024
940e5eb
[patch] roll back old RBAC for km-controller
karol-czarnecki Nov 12, 2024
fa87b2d
[patch] add copy secret WX to tenant namespace
karol-czarnecki Nov 12, 2024
6ba3783
[patch] add delete dro secret if exists
karol-czarnecki Nov 12, 2024
373b6c1
[patch] set var MAS_AIBROKER_SAAS as false for default
karol-czarnecki Nov 27, 2024
876eae1
[patch] rename task
karol-czarnecki Nov 27, 2024
2112581
[patch] add condition for controller and watcher if saas
karol-czarnecki Dec 3, 2024
86c234e
[patch] fix linter errors
karol-czarnecki Dec 3, 2024
54e897f
[patch] fix trailing spaces
karol-czarnecki Dec 3, 2024
416643f
[patch] update aibroker playbook to run tasks related to saas
karol-czarnecki Dec 3, 2024
3e74aad
[patch] fix linter issues
karol-czarnecki Dec 3, 2024
1a57c18
Squashed commit of the following:
karol-czarnecki Dec 3, 2024
6bbd273
[patch] update aibroker playbook
karol-czarnecki Dec 3, 2024
71c451f
[patch] add third params to create sls
karol-czarnecki Dec 4, 2024
3e6bdc0
[patch] remove mult dash from name
karol-czarnecki Dec 12, 2024
e3f2eaa
[patch] update with fix for saas
karol-czarnecki Dec 13, 2024
5a180aa
[patch] update AI Broker documentation for saas
karol-czarnecki Dec 19, 2024
ef5b38c
Squashed commit of the following:
karol-czarnecki Dec 19, 2024
7616c33
[patch] update odh to install specific version
karol-czarnecki Dec 19, 2024
8024454
[patch] refactor storage classes for kmodel
karol-czarnecki Dec 20, 2024
c701939
[patch] add specific ODH version deployment
karol-czarnecki Jan 2, 2025
b6a7115
[patch] update kmodels versions
karol-czarnecki Jan 2, 2025
2886bb0
[patch] update docs
karol-czarnecki Jan 2, 2025
099c231
[patch] update doc for AI Broker
karol-czarnecki Jan 3, 2025
c40f78d
[patch] update aibroker docs
karol-czarnecki Jan 3, 2025
2557d55
[patch] update fixed version of watcher
karol-czarnecki Jan 3, 2025
cf8ca7b
[patch] update watcher config map
karol-czarnecki Jan 3, 2025
4e6ed0b
[patch] comment out creation of server runtime
karol-czarnecki Jan 7, 2025
4400f3f
[patch] update create sls script
karol-czarnecki Jan 7, 2025
e80087d
[patch] add debug print
karol-czarnecki Jan 7, 2025
d8d8049
[patch] update path temp
karol-czarnecki Jan 7, 2025
a89da6b
[patch] add debug
karol-czarnecki Jan 7, 2025
f509532
[patch] update
karol-czarnecki Jan 7, 2025
d63acca
[patch] update
karol-czarnecki Jan 7, 2025
bd3cf44
[patch] update
karol-czarnecki Jan 7, 2025
b418712
[patch] remove debug commands
karol-czarnecki Jan 7, 2025
58c990e
[patch] cleanup and added fixes
karol-czarnecki Jan 7, 2025
d8d80a0
[patch] remove echos
karol-czarnecki Jan 7, 2025
6fb1b6b
[patch] update starting year
karol-czarnecki Jan 7, 2025
3cc5dda
[patch] add km-s3 secret to watcher deployment
karol-czarnecki Jan 8, 2025
476f568
[patch] update km-s3-secret (#1617)
roshi-dubey Jan 9, 2025
406f9d3
[patch] add provision tenant debug for investigation
karol-czarnecki Jan 9, 2025
5dc1164
[patch] update docs, and wait for service ready
karol-czarnecki Jan 10, 2025
8e7f1d5
[patch] update dns entries for aibroker (#1614)
roshi-dubey Jan 13, 2025
9558d11
[patch] added new services
karol-czarnecki Jan 13, 2025
db658e3
Merge branch 'abdb2433' of https://github.com/ibm-mas/ansible-devops …
karol-czarnecki Jan 13, 2025
bb1dbee
[patch] rollback old way install AiBroker
karol-czarnecki Jan 15, 2025
6ca7b6a
[patch] add ibm catalog to playbook
karol-czarnecki Jan 15, 2025
de0be60
[patch] update operator and playbook
karol-czarnecki Jan 16, 2025
d132675
[patch] fix to select correct operator
karol-czarnecki Jan 16, 2025
cc49f17
[patch] added cert manager role
karol-czarnecki Jan 16, 2025
1d43feb
[patch] comment out other aibroker deps
karol-czarnecki Jan 16, 2025
35a6237
[patch] add icr registry to CR
karol-czarnecki Jan 17, 2025
0ff62cd
[patch] add condition to wait for pod ready
karol-czarnecki Jan 17, 2025
4b67bd6
[patch] add condition to wait for pod
karol-czarnecki Jan 17, 2025
c372148
[patch] remove debug
karol-czarnecki Jan 17, 2025
fb76dbb
[patch] add wait for pod
karol-czarnecki Jan 17, 2025
1f61ce6
[patch] added wait
karol-czarnecki Jan 17, 2025
3c0f026
[patch] added wait
karol-czarnecki Jan 17, 2025
65d8f97
[patch] added other roles needed for Aibroker to playbook
karol-czarnecki Jan 20, 2025
179f187
Squashed commit of the following:
karol-czarnecki Jan 20, 2025
fcccaf5
[patch] update playbook
karol-czarnecki Jan 20, 2025
f8e51e2
Squashed commit of the following:
karol-czarnecki Jan 20, 2025
79aec2d
[patch] update aibroker playbook
karol-czarnecki Jan 20, 2025
3fd2b3e
[patch] add new role for aibroker configuration
karol-czarnecki Jan 21, 2025
e7a2e41
[patch] added get config tasks for dro/sls/db2
karol-czarnecki Jan 21, 2025
b1a3d86
[patch] update db2 name
karol-czarnecki Jan 21, 2025
4a16c5e
[patch] add b64decode for db2
karol-czarnecki Jan 21, 2025
3976347
[patch] update playbook
karol-czarnecki Jan 21, 2025
d8e57e2
[patch] update doc for current state of disable MAS from Airoker
karol-czarnecki Jan 21, 2025
39c73a4
[patch] update vars
karol-czarnecki Jan 21, 2025
b1f7283
[patch] update aibroker CR
karol-czarnecki Jan 21, 2025
f1a1702
[patch] add update CR task
karol-czarnecki Jan 22, 2025
4c08ff2
[patch] remove temp update CR
karol-czarnecki Jan 24, 2025
0838c0d
[patch] add mongo role temp
karol-czarnecki Jan 24, 2025
cb53eb1
[patch] move get cfgs to aibroker role
karol-czarnecki Jan 24, 2025
376de39
[patch] move roles dro db2 config to aibroker
karol-czarnecki Jan 24, 2025
fb8746b
[patch] update CR
karol-czarnecki Jan 24, 2025
6b16be7
[patch] update set fact to use string for certs
karol-czarnecki Jan 27, 2025
2396c06
[patch] remove join list for DRO/SLS/DB2
karol-czarnecki Jan 27, 2025
53f011f
[patch] added secret for DRO
karol-czarnecki Jan 27, 2025
e61bc71
[patch] add dro secrets
karol-czarnecki Jan 27, 2025
6b5d7a4
[patch] remove duplicate
karol-czarnecki Jan 27, 2025
a22eaa5
[patch] added secret for db2 admin
karol-czarnecki Jan 27, 2025
790fb94
[patch] update secret
karol-czarnecki Jan 27, 2025
8e96c37
[patch] added sls registration key secret
karol-czarnecki Jan 27, 2025
1ac1d86
[patch] fix typo for sls secret name
karol-czarnecki Jan 27, 2025
4e2f2e6
[patch] update CR
karol-czarnecki Jan 27, 2025
a0f7269
[patch] add operator group for AIbroker
karol-czarnecki Jan 27, 2025
e86ea52
[patch] disable OG for AIbroker
karol-czarnecki Jan 27, 2025
2f23f6d
[patch] add create aibroker namespace to main yml file
karol-czarnecki Jan 27, 2025
654f381
[patch] fix OG for AIbroker
karol-czarnecki Jan 27, 2025
9bfc422
[patch] parse cert to string for sls/dro/db2
karol-czarnecki Jan 28, 2025
968cf5c
[patch] update cert format in CR
karol-czarnecki Jan 28, 2025
56b13bc
[patch] add format for db2
karol-czarnecki Jan 28, 2025
b4e2e9b
[patch] increate time for wait for aibroker-api pod
karol-czarnecki Jan 28, 2025
b021db7
[patch] increase time waiting for pod ready
karol-czarnecki Jan 28, 2025
4ef131c
[patch] update playbook to create CR for aibroker workspace
karol-czarnecki Feb 24, 2025
a504e0f
[patch] fix no new line character at the end of file
karol-czarnecki Feb 24, 2025
cd3ccba
[patch] fix var name
karol-czarnecki Feb 24, 2025
8d6f0db
[patch] add task for wait until workspace CR finish
karol-czarnecki Feb 25, 2025
132855d
[patch] fix wait for workspace condition
karol-czarnecki Mar 5, 2025
ea7939d
[patch] update tenant name in CR
karol-czarnecki Mar 5, 2025
188ac80
[patch] add new role for create tenanr
karol-czarnecki Mar 14, 2025
613a943
[patch] fix new-line-at-end-of-file
karol-czarnecki Mar 14, 2025
39b974f
[patch] Adding jdbccfg, dro, certificate and truststore task (#1683)
jasmin-30 Mar 18, 2025
fbb9e14
[patch] merge Masaib7501 (#1688)
karol-czarnecki Mar 20, 2025
40e9eb2
[patch] fixed type on CRD
karol-czarnecki Mar 20, 2025
a88b5c3
[patch] updated aibroker_tenant role
jasmin-30 Mar 21, 2025
5ed1ed3
[patch] enabled aibroker_tenant role
jasmin-30 Mar 21, 2025
c4940d5
[patch] Reverted changes
jasmin-30 Mar 21, 2025
a1915b4
[patch] Fix aibroker_tenant role (#1692)
jasmin-30 Mar 25, 2025
775f00c
[patch] added SSL (#1699)
shauryasandoo Mar 27, 2025
ed0775e
[patch] adding ssl cert fix (#1704)
shauryasandoo Apr 3, 2025
910b439
[minor] Create workspace CR task (#1685)
boonware Apr 4, 2025
c035479
[minor] Improve usage of variables in AI Broker tenant role (#1708)
boonware Apr 7, 2025
fc29e71
[patch] removed wait for aibroker-api, and route tasks which are not …
karol-czarnecki Apr 10, 2025
6c1f36a
[patch] roll back route as it is needed for register DRO and SLS
karol-czarnecki Apr 10, 2025
cb81375
[patch] update playbook docs for aibroker
karol-czarnecki Apr 10, 2025
858dc7e
[patch] added to create tenant part needed vars for storage
karol-czarnecki Apr 11, 2025
5dd0238
[patch] update kmodels to be inline versions for SAAS release
karol-czarnecki Apr 14, 2025
9f6b251
[patch] change var IN_SAAS_ENV to MAS_AIBROKER_SAAS - remove vars du…
Bhautik-Vala Apr 14, 2025
1ab2978
[patch] Adding conditional check for mongodb, sls, dro, db2, mariadb,…
jasmin-30 Apr 22, 2025
c7da559
[patch] update odh to 2.19.0
karol-czarnecki Apr 23, 2025
658e980
[patch] update docs with new dependencies
karol-czarnecki Apr 23, 2025
dbbfe03
[minor] simplify AI Broker tenant setup (#1721)
boonware Apr 25, 2025
4a2bd38
[patch] remove unused CR fields (#1722)
boonware Apr 25, 2025
9958ec1
[major] AI Service entitlement in tenant CR (#1723)
boonware Apr 28, 2025
492f1b7
[patch] Sync ansible-devops playbook Saas with June release (#1726)
karol-czarnecki Apr 29, 2025
f365098
[patch] update dro and db certs from CR (#1728)
roshi-dubey May 1, 2025
1dfe78b
[patch] update connector step and pipline steps versions
karol-czarnecki May 6, 2025
b3e4502
[patch] fix DRO secret creation (#1734)
boonware May 7, 2025
76e3b2e
[patch] update default version of ODH to 2.28.0
karol-czarnecki May 7, 2025
e965717
Merge branch 'aib2op' of https://github.com/ibm-mas/ansible-devops in…
karol-czarnecki May 7, 2025
79d8371
[patch] update dspa CR for v2 version
karol-czarnecki May 7, 2025
1f36da3
[patch] added var mas_aibroker_storage_ssl as role kmodels need this
karol-czarnecki May 7, 2025
54f537f
[patch] update controller to 1.0.9
karol-czarnecki May 7, 2025
559da49
[patch] update controller config map for ODH 228
karol-czarnecki May 7, 2025
61708b3
[patch] update config map for controller
karol-czarnecki May 7, 2025
8d0b6a6
[patch] add NP for predictor
karol-czarnecki May 8, 2025
f1c205c
[patch] remove SLS registration (#1736)
boonware May 8, 2025
3670aa5
[patch] Update CR secret fields (#1738)
boonware May 9, 2025
ebaf495
[patch] restore odh 2.19.0 for dcut
karol-czarnecki May 12, 2025
06a71eb
[patch] restore ODH 2.19.0 cr version
karol-czarnecki May 12, 2025
18d1b0e
Added the rsl-secret
sidd101010 May 12, 2025
2943b52
Read rsl config from environment
sidd101010 May 12, 2025
0d1f122
create the rsl-secret.yml.j2
sidd101010 May 12, 2025
e3b3595
Added the few var
sidd101010 May 12, 2025
2102ab9
Remove the unwanted vars
sidd101010 May 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 6 additions & 1 deletion .github/workflows/ansible-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ jobs:
ansible-publish:
runs-on: ubuntu-latest
steps:
- name: Install Python v3.11
uses: actions/setup-python@v5
with:
python-version: '3.11'

- name: Checkout
uses: actions/[email protected]

Expand Down Expand Up @@ -64,7 +69,7 @@ jobs:
podman images
podman login --username "${{ secrets.QUAYIO_USERNAME }}" --password "${{ secrets.QUAYIO_PASSWORD }}" quay.io
podman push quay.io/ibmmas/ansible-devops-ee:latest
podman push quay.io/ibmmas/ansible-devops-ee:${{ env.DOCKER_TAG }}
podman push quay.io/ibmmas/ansible-devops-ee:${{ env.DOCKER_TAG }}

- name: Trigger ibm-mas/cli rebuild on Ansible Collection release
run: |
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/ansible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,15 @@ on:
- '**'
jobs:
ansible-build:
name: Build Ansible Collection
runs-on: ubuntu-latest
if: ${{ !contains(github.event.head_commit.message, '[doc]') }}
steps:
- name: Install Python v3.11
uses: actions/setup-python@v5
with:
python-version: '3.11'

- name: Checkout
uses: actions/[email protected]
# Without this option, we don't get the tag information
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install and Build
run: |
bash build/bin/copy-role-docs.sh
python -m pip install -q mkdocs
python -m pip install -q mkdocs mkdocs-carbon mkdocs-glightbox
mkdocs build --verbose --clean --strict

- name: Deploy
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ build/bin/downloads/*.tgz
.pyenv
cpd-cli-workspace/*
/tmp
/node_modules
package-lock.json
package.json
ibm/mas_devops/playbooks/certs/
52 changes: 52 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Don't change markdown files
**/*.md

# Exclude entirely the roles
# TODO: Gradually remove these rules and verify the formatting
/ibm/mas_devops/roles/ocp_cluster_monitoring/**/*.*
/ibm/mas_devops/roles/ocp_config/**/*.*
/ibm/mas_devops/roles/ocp_deprovision/**/*.*
/ibm/mas_devops/roles/ocp_efs/**/*.*
/ibm/mas_devops/roles/ocp_github_oauth/**/*.*
/ibm/mas_devops/roles/ocp_idms/**/*.*
/ibm/mas_devops/roles/ocp_login/**/*.*
/ibm/mas_devops/roles/ocp_node_config/**/*.*
/ibm/mas_devops/roles/ocp_provision/**/*.*
/ibm/mas_devops/roles/ocp_roks_upgrade_registry_storage/**/*.*
/ibm/mas_devops/roles/ocp_simulate_disconnected_network/**/*.*
/ibm/mas_devops/roles/ocp_upgrade/**/*.*
/ibm/mas_devops/roles/ocp_verify/**/*.*
/ibm/mas_devops/roles/ocs/**/*.*
/ibm/mas_devops/roles/odh/**/*.*
/ibm/mas_devops/roles/opentelemetry/**/*.*
/ibm/mas_devops/roles/registry/**/*.*
/ibm/mas_devops/roles/sls/**/*.*
/ibm/mas_devops/roles/smtp/**/*.*
/ibm/mas_devops/roles/suite_app_backup_restore/**/*.*
/ibm/mas_devops/roles/suite_app_config/**/*.*
/ibm/mas_devops/roles/suite_app_install/**/*.*
/ibm/mas_devops/roles/suite_app_rollback/**/*.*
/ibm/mas_devops/roles/suite_app_uninstall/**/*.*
/ibm/mas_devops/roles/suite_app_upgrade/**/*.*
/ibm/mas_devops/roles/suite_app_verify/**/*.*
/ibm/mas_devops/roles/suite_backup_restore/**/*.*
/ibm/mas_devops/roles/suite_certs/**/*.*
/ibm/mas_devops/roles/suite_config/**/*.*
/ibm/mas_devops/roles/suite_db2_setup_for_manage/**/*.*
/ibm/mas_devops/roles/suite_dns/**/*.*
/ibm/mas_devops/roles/suite_install/**/*.*
/ibm/mas_devops/roles/suite_manage_attachments_config/**/*.*
/ibm/mas_devops/roles/suite_manage_bim_config/**/*.*
/ibm/mas_devops/roles/suite_manage_birt_report_config/**/*.*
/ibm/mas_devops/roles/suite_manage_customer_files_config/**/*.*
/ibm/mas_devops/roles/suite_manage_imagestitching_config/**/*.*
/ibm/mas_devops/roles/suite_manage_import_certs_config/**/*.*
/ibm/mas_devops/roles/suite_manage_load_dbc_scripts/**/*.*
/ibm/mas_devops/roles/suite_manage_logging_config/**/*.*
/ibm/mas_devops/roles/suite_manage_pvc_config/**/*.*
/ibm/mas_devops/roles/suite_rollback/**/*.*
/ibm/mas_devops/roles/suite_uninstall/**/*.*
/ibm/mas_devops/roles/suite_upgrade/**/*.*
/ibm/mas_devops/roles/suite_verify/**/*.*
/ibm/mas_devops/roles/turbonomic/**/*.*
/ibm/mas_devops/roles/uds/**/*.*
4 changes: 2 additions & 2 deletions build/bin/build-collection.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ cat $GITHUB_WORKSPACE/ibm/mas_devops/galaxy.yml


# Update this when we have new catalog
MAS_PREVIOUS_CATALOG='v9-240827-amd64'
MAS_LATEST_CATALOG='v9-241003-amd64'
MAS_PREVIOUS_CATALOG='v9-241205-amd64'
MAS_LATEST_CATALOG='v9-250109-amd64'


# Update all the placeholders in the playbooks
Expand Down
4 changes: 2 additions & 2 deletions build/bin/copy-role-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ copyDoc gencfg_workspace
copyDoc grafana
copyDoc ibm_catalogs
copyDoc ibmcloud_resource_key
copyDoc install_operator
copyDoc kafka
copyDoc key_rotation
copyDoc kmodels
Expand All @@ -52,7 +51,7 @@ copyDoc mongodb
copyDoc nvidia_gpu
copyDoc ocp_cluster_monitoring
copyDoc ocp_config
copyDoc ocp_contentsourcepolicy
copyDoc ocp_idms
copyDoc ocp_deprovision
copyDoc ocp_efs
copyDoc ocp_github_oauth
Expand Down Expand Up @@ -86,6 +85,7 @@ copyDoc suite_manage_bim_config
copyDoc suite_manage_birt_report_config
copyDoc suite_manage_customer_files_config
copyDoc suite_manage_attachments_config
copyDoc suite_manage_imagestitching_config
copyDoc suite_manage_import_certs_config
copyDoc suite_manage_load_dbc_scripts
copyDoc suite_manage_logging_config
Expand Down
180 changes: 2 additions & 178 deletions docs/execution-environment.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Execution Environment
===============================================================================
Details on the Red Hat Ansible Automation Platform Execution Environment for ansible-devops.
Details on the [Red Hat Ansible Automation Platform](https://www.redhat.com/en/technologies/management/ansible) Execution Environment for the **ibm.mas_devops** Ansible Collection.


Execution Environment Image
Expand Down Expand Up @@ -228,7 +228,7 @@ If you need to set an environment variable then you can do this in the playbook
ocp_version: 4.14.35
rosa_compute_nodes: 3

environment:
environment:
AWS_DEFAULT_REGION: us-east-1
AWS_ACCESS_KEY_ID: "{{ aws_access_key_id }}"
AWS_SECRET_ACCESS_KEY: "{{ aws_secret_access_key }}"
Expand All @@ -245,148 +245,6 @@ If you need to set an environment variable then you can do this in the playbook
- ibm.mas_devops.ocp_efs
```

### backup/restore
The backup and restore tasks and playbooks provided in the `ibm.mas_devops` collection has a number of differences with other roles/playbooks that can make creating the playbook difficult. The following playbook is an example of how a backup for core playbook can be written to work with AAP, along with a rclone.conf.j2 file that should be stored in the same location as the playbook in your SCM. The playbook needs to set both the `environment` so that the `ansible_env` var is set, and for task vars to be set to override the common_vars that are looking for environment variables on the local controller (note that `environment` does not update the local controller environment so lookups using the ansible builtin `env` won't pick up those values).

This playbook requires the following survey questions to be setup:

```yaml
{
"aws_access_key_id": "$encrypted$",
"aws_secret_access_key": "$encrypted$",
"ocp_token": "$encrypted$",
"ocp_server": "https://api.your_ocp_cluster:6443"
}
```

```yaml
---
- name: "Backup/Restore MAS Core"
hosts: localhost
any_errors_fatal: true

vars:
# Define the target for backup/restore
mas_instance_id: aap1

# Define what action to perform
masbr_action: backup

# Define storage type
masbr_storage_type: cloud
masbr_storage_cloud_rclone_file: rclone.conf
masbr_storage_cloud_rclone_name: masbr
masbr_storage_cloud_bucket: mas-backup

# Define what to backup/restore
masbr_job_component:
name: "core"
instance: "{{ mas_instance_id }}"
namespace: "mas-{{ mas_instance_id }}-core"

# Configure path to backup_restore tasks that should be present in the execution environment
role_path: "/usr/share/ansible/collections/ansible_collections/ibm/mas_devops/roles/suite_backup_restore"

# Set here to get into ansible_env
environment:
MASBR_STORAGE_TYPE: cloud
MASBR_STORAGE_CLOUD_RCLONE_FILE: rclone.conf
MASBR_STORAGE_CLOUD_RCLONE_NAME: masbr
MASBR_STORAGE_CLOUD_BUCKET: mas-backup

pre_tasks:
- name: "Asserts aws_access_key_id secret defined"
assert:
that: aws_access_key_id is defined
fail_msg: "aws_access_key_id not defined"

- name: "Asserts aws_secret_access_key secret defined"
assert:
that: aws_secret_access_key is defined
fail_msg: "aws_secret_access_key not defined"

# Template out the rclone.conf so no credentials are stored in git
- name: "Create rclone.conf"
template:
src: "{{ masbr_storage_cloud_rclone_file }}.j2"
dest: "{{ masbr_storage_cloud_rclone_file }}"

roles:
- ibm.mas_devops.ocp_login

tasks:

# Common checks before run tasks
# -------------------------------------------------------------------------
- name: "Before run tasks"
include_tasks:
file: "{{ role_path }}/../../common_tasks/backup_restore/before_run_tasks.yml"
vars:
_job_type: "{{ masbr_action }}"
masbr_storage_type: cloud
masbr_storage_cloud_rclone_file: rclone.conf
masbr_storage_cloud_rclone_name: masbr
masbr_storage_cloud_bucket: mas-backup

# Create k8s Job to run backup/restore tasks
# -------------------------------------------------------------------------
- name: "Create k8s Job to run {{ masbr_action }} tasks"
when: masbr_create_task_job
include_tasks:
file: "{{ role_path }}/../../common_tasks/backup_restore/create_run_tasks_job.yml"
vars:
_rt_playbook_name: "br_core"
_rt_env:
- name: "MASBR_ACTION"
value: "{{ masbr_action }}"
- name: "MASBR_JOB_VERSION"
value: "{{ masbr_job_version }}"
- name: "MAS_INSTANCE_ID"
value: "{{ mas_instance_id }}"
masbr_storage_type: cloud
masbr_storage_cloud_rclone_file: rclone.conf
masbr_storage_cloud_rclone_name: masbr
masbr_storage_cloud_bucket: mas-backup

# Run backup/restore tasks locally
# -------------------------------------------------------------------------
- name: "Run {{ masbr_action }} tasks"
when: not masbr_create_task_job
block:
- name: "MongoDB: {{ masbr_action }}"
include_role:
name: ibm.mas_devops.mongodb
vars:
mongodb_action: "{{ masbr_action }}"
mas_app_id: "core"
masbr_storage_type: cloud
masbr_storage_cloud_rclone_file: rclone.conf
masbr_storage_cloud_rclone_name: masbr
masbr_storage_cloud_bucket: mas-backup

- name: "MAS Core namespace: {{ masbr_action }}"
include_role:
name: ibm.mas_devops.suite_backup_restore
vars:
masbr_storage_type: cloud
masbr_storage_cloud_rclone_file: rclone.conf
masbr_storage_cloud_rclone_name: masbr
masbr_storage_cloud_bucket: mas-backup
```

The following file is stored in your SCM and is a template to be injected with the credentials needed during the play. This allows the file to be stored in SCM without exposing credentials.

rclone.conf.j2
```
[masbr]
type = s3
provider = Minio
endpoint = http://minio-api.apps.mydomain.com
access_key_id = "{{ aws_access_key_id }}"
secret_access_key = "{{ aws_secret_access_key }}"
region = minio
```

Troubleshooting
-------------------------------------------------------------------------------

Expand Down Expand Up @@ -459,37 +317,3 @@ Example setting role vars:
vars:
kafka_version: 3.7.0
```

One caveat to the above is the `backup/restore` tasks as these use a combination of ansible vars and expecting environment variables to be set in the `ansible_env` variable. In order to work with `the backup/restore` tasks you need to set both `environment` and role/task vars (not play vars).

Example, showing `environment` and task vars set. See [backup exmaple](#examples-of-playbooks) for more complete play:
```yaml
- name: "Backup/Restore MAS Core"
hosts: localhost
any_errors_fatal: true

vars:
# Configure path to backup_restore tasks
role_path: "/usr/share/ansible/collections/ansible_collections/ibm/mas_devops/roles/suite_backup_restore"

# Set here to get into ansible_env
environment:
MASBR_STORAGE_TYPE: cloud
MASBR_STORAGE_CLOUD_RCLONE_FILE: rclone.conf
MASBR_STORAGE_CLOUD_RCLONE_NAME: masbr
MASBR_STORAGE_CLOUD_BUCKET: mas-backup

tasks:

# Common checks before run tasks
# -------------------------------------------------------------------------
- name: "Before run tasks"
include_tasks:
file: "{{ role_path }}/../../common_tasks/backup_restore/before_run_tasks.yml"
vars:
_job_type: "{{ masbr_action }}"
masbr_storage_type: cloud
masbr_storage_cloud_rclone_file: rclone.conf
masbr_storage_cloud_rclone_name: masbr
masbr_storage_cloud_bucket: mas-backup
```
48 changes: 0 additions & 48 deletions docs/extra.css

This file was deleted.

Loading
Loading