Skip to content

Commit

Permalink
Update default values for MicroShift 4.15; add feature to install olm…
Browse files Browse the repository at this point in the history
… via rpm

This commit provides few features related to that project:
- added workaround when the version file does not exists,
  so clean setup of the MicroShift  4.15 was not possible
- added a feature to setup the OLM via MicroShift RPM package
  • Loading branch information
danpawlik authored and Daniel P committed Jun 12, 2024
1 parent acd822e commit c638305
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
9 changes: 5 additions & 4 deletions defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ firewalld_rules_permament: true
use_copr_microshift: false

# The Microshift version that is available in the repository.
microshift_version: 4.14
microshift_version: 4.15

# Default settings from /etc/microshift/config.yaml.default
# https://github.com/openshift/microshift/blob/release-4.14/packaging/microshift/config.yaml
# https://github.com/openshift/microshift/blob/release-4.15/packaging/microshift/config.yaml
microshift_config: {}
# apiServer:
# advertiseAddress: ""
Expand Down Expand Up @@ -71,7 +71,7 @@ microshift_config: {}
# nodeIP: ""

# Default settings from /etc/microshift/lvmd.yaml.default
# https://github.com/openshift/microshift/blob/release-4.14/packaging/microshift/lvmd.yaml
# https://github.com/openshift/microshift/blob/release-4.15/packaging/microshift/lvmd.yaml
microshift_lmvd: {}
# socket-name: /run/lvmd/lvmd.socket
# device-classes:
Expand All @@ -85,7 +85,7 @@ microshift_lmvd: {}
# - ""

# Default settings from /etc/microshift/ovn.yaml.default
# https://github.com/openshift/microshift/blob/release-4.14/packaging/microshift/ovn.yaml
# https://github.com/openshift/microshift/blob/release-4.15/packaging/microshift/ovn.yaml
microshift_ovn: {}
# mtu: 1500

Expand All @@ -96,6 +96,7 @@ microshift_ovn: {}
# Install the OLM - https://olm.operatorframework.io/
setup_olm: false
# https://github.com/operator-framework/operator-lifecycle-manager/releases
microshift_olm_package: true
olm_version: "v0.28.0"

# Version of the Operator SDK
Expand Down
14 changes: 14 additions & 0 deletions tasks/microshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,20 @@
notify: Restart Microshift
when: not use_copr_microshift

- name: Check if version file exists
become: true
ansible.builtin.stat:
path: /var/lib/microshift/version
register: _microshift_version_file

- name: "Create a version file if does not exists with version {{ microshift_version }}.0"
become: true
when: not _microshift_version_file.stat.exists
ansible.builtin.copy:
content: |
{{ microshift_version }}.0
dest: /var/lib/microshift/version

- name: Change Microshift configuration files
become: true
ansible.builtin.copy:
Expand Down

0 comments on commit c638305

Please sign in to comment.