From c4803651dd92bc8414fc5d2c1afd711408b3f996 Mon Sep 17 00:00:00 2001 From: Nicolas MASSE Date: Fri, 1 Dec 2017 07:57:07 +0100 Subject: [PATCH] prefix variables so that they do not conflict with openshift-ansible --- prod.hosts | 2 +- roles/openshift-prereq/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/prod.hosts b/prod.hosts index 27e7b03..33e7643 100644 --- a/prod.hosts +++ b/prod.hosts @@ -3,7 +3,7 @@ # [lab:vars] lab_dns_suffix=itix.fr -openshift_version=3.7 +lab_openshift_version=3.7 [lab:children] masters diff --git a/roles/openshift-prereq/tasks/main.yml b/roles/openshift-prereq/tasks/main.yml index 1086a4e..20e58ac 100644 --- a/roles/openshift-prereq/tasks/main.yml +++ b/roles/openshift-prereq/tasks/main.yml @@ -10,7 +10,7 @@ - rhel-7-server-rpms - rhel-7-server-optional-rpms - rhel-7-server-extras-rpms - - rhel-7-server-ose-{{ openshift_version }}-rpms + - rhel-7-server-ose-{{ lab_openshift_version }}-rpms - rhel-7-fast-datapath-rpms # see https://access.redhat.com/solutions/3008401 tags: rpm