From f1aec4727384913d0c0b285c58878d299d5f6bfb Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 23 Mar 2017 17:05:54 -0400 Subject: Specify enterprise defaults for logging and metrics images --- roles/openshift_logging/vars/openshift-enterprise.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 roles/openshift_logging/vars/openshift-enterprise.yml (limited to 'roles/openshift_logging/vars/openshift-enterprise.yml') diff --git a/roles/openshift_logging/vars/openshift-enterprise.yml b/roles/openshift_logging/vars/openshift-enterprise.yml new file mode 100644 index 000000000..f30e40947 --- /dev/null +++ b/roles/openshift_logging/vars/openshift-enterprise.yml @@ -0,0 +1,2 @@ +openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | default('registry.access.redhat.com/openshift3/') }}" +openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default(openshift_release | default ('3.5.0') ) }}" -- cgit v1.2.3 From c8afa7e4548e8c1baaeaf4bea3220a20ff71b7b9 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 23 Mar 2017 17:32:17 -0400 Subject: Make linter happy --- roles/openshift_logging/vars/openshift-enterprise.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/openshift_logging/vars/openshift-enterprise.yml') diff --git a/roles/openshift_logging/vars/openshift-enterprise.yml b/roles/openshift_logging/vars/openshift-enterprise.yml index f30e40947..4009b0690 100644 --- a/roles/openshift_logging/vars/openshift-enterprise.yml +++ b/roles/openshift_logging/vars/openshift-enterprise.yml @@ -1,2 +1,3 @@ +--- openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | default('registry.access.redhat.com/openshift3/') }}" openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default(openshift_release | default ('3.5.0') ) }}" -- cgit v1.2.3 From 22d8eccb74bd2a1da5c29c0020f1f7ba89164cdc Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 24 Mar 2017 11:17:44 -0400 Subject: Fix overriding openshift_{logging,metrics}_image_prefix --- roles/openshift_logging/vars/openshift-enterprise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_logging/vars/openshift-enterprise.yml') diff --git a/roles/openshift_logging/vars/openshift-enterprise.yml b/roles/openshift_logging/vars/openshift-enterprise.yml index 4009b0690..9679d209a 100644 --- a/roles/openshift_logging/vars/openshift-enterprise.yml +++ b/roles/openshift_logging/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- -openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | default('registry.access.redhat.com/openshift3/') }}" -openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default(openshift_release | default ('3.5.0') ) }}" +__openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | default('registry.access.redhat.com/openshift3/') }}" +__openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default(openshift_release | default ('3.5.0') ) }}" -- cgit v1.2.3