Skip to content

Commit

Permalink
Merge pull request #598 from akrzos/enable_cnv_install_var
Browse files Browse the repository at this point in the history
Enable Assisted-installer to install CNV and LSO
  • Loading branch information
openshift-merge-bot[bot] authored Jan 30, 2025
2 parents 81ba1dc + 04ba5e3 commit ef16167
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 2 deletions.
12 changes: 12 additions & 0 deletions ansible/roles/install-cluster/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,18 @@
body: "{{ lookup('template', 'install-config-overrides.yml.j2') | from_yaml | to_json(ensure_ascii=False) | string | to_json(ensure_ascii=False) | string }}"
register: get_install_config

- name: Enable CNV and LSO install
uri:
url: "http://{{ assisted_installer_host }}:{{ assisted_installer_port }}/api/assisted-install/v2/clusters/{{ ai_cluster_id }}"
method: PATCH
body_format: json
status_code: [201]
return_content: true
body:
olm_operators:
- name: "cnv"
when: enable_cnv_install | default(false)

- name: Install cluster
uri:
url: "http://{{ assisted_installer_host }}:{{ assisted_installer_port }}/api/assisted-install/v2/clusters/{{ ai_cluster_id }}/actions/install"
Expand Down
3 changes: 3 additions & 0 deletions ansible/vars/all.sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ public_vlan: false
# Enables FIPs security standard
enable_fips: false

# Enables Operators CNV and LSO install at deployment timeframe
enable_cnv_install: false

ssh_private_key_file: ~/.ssh/id_rsa
ssh_public_key_file: ~/.ssh/id_rsa.pub
# Place your pull_secret.txt in the base directory of the cloned jetlag repo, Example:
Expand Down
7 changes: 5 additions & 2 deletions ansible/vars/ibmcloud.sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ ocp_build: "ga"
# For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest'
ocp_version: "latest-4.17"

ssh_private_key_file: ~/.ssh/id_rsa
ssh_public_key_file: ~/.ssh/id_rsa.pub
# Enables Operators CNV and LSO install at deployment timeframe
enable_cnv_install: false

ssh_private_key_file: ~/.ssh/ibmcloud_id_rsa
ssh_public_key_file: ~/.ssh/ibmcloud_id_rsa.pub
# Place your pull_secret.txt in the base directory of the cloned jetlag repo, Example:
# [root@<bastion> jetlag]# ls pull_secret.txt
pull_secret: "{{ lookup('file', '../pull_secret.txt') }}"
Expand Down
3 changes: 3 additions & 0 deletions docs/deploy-mno-byol.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,9 @@ public_vlan: false
# Enables FIPs security standard
enable_fips: false
# Enables Operators CNV and LSO install at deployment timeframe
enable_cnv_install: false
ssh_private_key_file: ~/.ssh/id_rsa
ssh_public_key_file: ~/.ssh/id_rsa.pub
# Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example:
Expand Down
3 changes: 3 additions & 0 deletions docs/deploy-mno-ibmcloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,9 @@ ocp_build: "ga"
# For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest'
ocp_version: "latest-4.17"
# Enables Operators CNV and LSO install at deployment timeframe
enable_cnv_install: false
ssh_private_key_file: ~/.ssh/ibmcloud_id_rsa
ssh_public_key_file: ~/.ssh/ibmcloud_id_rsa.pub
# Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example:
Expand Down
3 changes: 3 additions & 0 deletions docs/deploy-mno-performancelab.md
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@ public_vlan: false
# Enables FIPs security standard
enable_fips: false
# Enables Operators CNV and LSO install at deployment timeframe
enable_cnv_install: false
ssh_private_key_file: ~/.ssh/id_rsa
ssh_public_key_file: ~/.ssh/id_rsa.pub
# Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example:
Expand Down
3 changes: 3 additions & 0 deletions docs/deploy-mno-scalelab.md
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,9 @@ public_vlan: false
# Enables FIPs security standard
enable_fips: false
# Enables Operators CNV and LSO install at deployment timeframe
enable_cnv_install: false
ssh_private_key_file: ~/.ssh/id_rsa
ssh_public_key_file: ~/.ssh/id_rsa.pub
# Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example:
Expand Down
3 changes: 3 additions & 0 deletions docs/deploy-sno-ibmcloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ ocp_build: "ga"
# For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest'
ocp_version: "latest-4.17"

# Enables Operators CNV and LSO install at deployment timeframe
enable_cnv_install: false

ssh_private_key_file: ~/.ssh/ibmcloud_id_rsa
ssh_public_key_file: ~/.ssh/ibmcloud_id_rsa.pub
# Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example:
Expand Down
3 changes: 3 additions & 0 deletions docs/deploy-sno-performancelab.md
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,9 @@ public_vlan: false
# Enables FIPs security standard
enable_fips: false
# Enables Operators CNV and LSO install at deployment timeframe
enable_cnv_install: false
ssh_private_key_file: ~/.ssh/id_rsa
ssh_public_key_file: ~/.ssh/id_rsa.pub
# Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example:
Expand Down
3 changes: 3 additions & 0 deletions docs/deploy-sno-scalelab.md
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,9 @@ public_vlan: false
# Enables FIPs security standard
enable_fips: false
# Enables Operators CNV and LSO install at deployment timeframe
enable_cnv_install: false
ssh_private_key_file: ~/.ssh/id_rsa
ssh_public_key_file: ~/.ssh/id_rsa.pub
# Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example:
Expand Down

0 comments on commit ef16167

Please sign in to comment.