From df38d67d44520328eda7ec82b46d2b90e6ce83f6 Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Tue, 9 Jun 2020 16:10:27 +0100 Subject: [PATCH] [osbs] different package version per arch --- playbooks/groups/osbs/deploy-cluster.yml | 2 ++ .../templates/cluster-inventory-osbs.j2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/playbooks/groups/osbs/deploy-cluster.yml b/playbooks/groups/osbs/deploy-cluster.yml index 8464a60bb3..f26e1ebcda 100644 --- a/playbooks/groups/osbs/deploy-cluster.yml +++ b/playbooks/groups/osbs/deploy-cluster.yml @@ -234,6 +234,7 @@ openshift_master_public_api_url: "https://{{ osbs_url }}:8443" openshift_release: "v3.11" openshift_version: "v3.11" + openshift_pkg_version: "-3.11*" openshift_ansible_path: "/root/openshift-ansible" openshift_ansible_pre_playbook: "playbooks/prerequisites.yml" openshift_ansible_playbook: "playbooks/deploy_cluster.yml" @@ -274,6 +275,7 @@ openshift_master_public_api_url: "https://{{ osbs_url }}:8443" openshift_release: "v3.11" openshift_version: "v3.11" + openshift_pkg_version: "-3.11.1" openshift_ansible_path: "/root/openshift-ansible" openshift_ansible_pre_playbook: "playbooks/prerequisites.yml" openshift_ansible_playbook: "playbooks/deploy_cluster.yml" diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2 index 0224373a07..bb15742e74 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2 @@ -96,7 +96,7 @@ openshift_image_tag={{openshift_release}} # Specify an exact rpm version to install or configure. # WARNING: This value will be used for all hosts in RPM based environments, even those that have another version installed. # This could potentially trigger an upgrade and downtime, so be careful with modifying this value after the cluster is set up. -openshift_pkg_version=-3.11.1 +openshift_pkg_version={{openshift_pkg_version}} # Install the openshift examples {% if openshift_ansible_install_examples is defined %} openshift_install_examples={{openshift_ansible_install_examples}}