Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ansible/action_plugins/agnosticd_user_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ def run(self, tmp=None, task_vars=None):

if not user and body != None:
with open(os.path.join(output_dir, f'{action}-user-body.yaml'), 'a') as fh:
fh.write('- ' + json.dumps(body) + "\n")
fh.write('- ' + json.dumps(body, default=str) + "\n")

if data or user:
data = json.loads(json.dumps(data))
data = json.loads(json.dumps(data, default=str))
user_data = None
try:
with open(os.path.join(output_dir, f'{action}-user-data.yaml'), 'r') as fh:
Expand Down
2 changes: 1 addition & 1 deletion ansible/configs/ansible-bu-workshop/workloads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Install {{ _workload_title_ }} workloads on localhost
hosts: localhost
gather_facts: false
become: true
become: false
tasks:
- name: Deploying {{ _workload_title_ }} workloads on localhost
when: _workloads_.localhost | default("") | length > 0
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/containerlab/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

- name: Fetch stable containerlab RPM
ansible.builtin.get_url:
url: wget https://github.com/srl-labs/containerlab/releases/download/v0.71.0/containerlab_0.71.0_linux_amd64.rpm"
url: https://github.com/srl-labs/containerlab/releases/download/v0.71.0/containerlab_0.71.0_linux_amd64.rpm
dest: /tmp/containerlab_0.71.0_linux_amd64.rpm
mode: '0644'

Expand Down
1 change: 1 addition & 0 deletions ansible/roles/control-user/tasks/report-user-data.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
- name: Report user data
when: control_user_password is defined
throttle: 1
agnosticd_user_info:
data: >-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ apiVersion: v1
metadata:
name: {{ cluster_name | to_json }}
baseDomain: {{ ocp4_base_domain | to_json }}
cpuPartitioningMode: {{ ocp4_cpu_partitioning_mode | default('None') | to_json }}
{% if ocp4_cpu_partitioning_mode is defined %}
cpuPartitioningMode: {{ ocp4_cpu_partitioning_mode | to_json }}
{% endif %}
fips: {{ ocp4_fips_enable | bool | to_json }}
controlPlane:
name: master
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% set _provider = (showroom_tls_provider | default(certbot_cert_manager_provider, true) | default('zerossl')) | lower %}
{% set _provider = (showroom_tls_provider | default(certbot_cert_manager_provider | default('zerossl'), true) | default('zerossl')) | lower %}
{% if _provider == 'zerossl' %}
{% set _caserver = showroom_acme_zerossl_caserver | default(certbot_cert_manager_acme_url, true) %}
{% set _caserver = showroom_acme_zerossl_caserver | default(certbot_cert_manager_acme_url | default(''), true) %}
{% set _challenge = showroom_acme_zerossl_acme_challenge %}
{% set _zerossl_eab_kid = showroom_acme_zerossl_eab_kid | default(certbot_cert_manager_zerossl_eab_key_id, true) %}
{% set _zerossl_eab_hmac = showroom_acme_zerossl_eab_hmac_key | default(certbot_cert_manager_zerossl_hmac_key, true) %}
{% set _zerossl_eab_kid = showroom_acme_zerossl_eab_kid | default(certbot_cert_manager_zerossl_eab_key_id | default(''), true) %}
{% set _zerossl_eab_hmac = showroom_acme_zerossl_eab_hmac_key | default(certbot_cert_manager_zerossl_hmac_key | default(''), true) %}
{% elif _provider == 'letsencrypt' %}
{% set _caserver = showroom_acme_letsencrypt_caserver | default(certbot_cert_manager_acme_url, true) %}
{% set _caserver = showroom_acme_letsencrypt_caserver | default(certbot_cert_manager_acme_url | default(''), true) %}
{% set _challenge = showroom_acme_letsencrypt_acme_challenge %}
{% set _zerossl_eab_kid = '' %}
{% set _zerossl_eab_hmac = '' %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ocp4_workload_gitea_operator_starting_csv: ""
ocp4_workload_gitea_operator_catalog_image: quay.io/rhpds/gitea-catalog

# Catalog image tag
ocp4_workload_gitea_operator_catalog_image_tag: v2.0.1
ocp4_workload_gitea_operator_catalog_image_tag: v2.3.2

# -----------------------------------
# Deploy and customize Gitea Instance
Expand Down
Loading