summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/vars
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-15 20:08:06 -0800
committerGitHub <noreply@github.com>2017-11-15 20:08:06 -0800
commit9df909053978f515ace83626755a78c163357ba2 (patch)
tree925a069ddb7bde3ad7422a85f8cb505c4eafd246 /roles/openshift_logging/vars
parent6cfc4a162cff36bb2ba7bb482135060e76c5d5a1 (diff)
parentaea3fa16ecf72ea5657fa95d96558a7ebde9f66e (diff)
downloadopenshift-9df909053978f515ace83626755a78c163357ba2.tar.gz
openshift-9df909053978f515ace83626755a78c163357ba2.tar.bz2
openshift-9df909053978f515ace83626755a78c163357ba2.tar.xz
openshift-9df909053978f515ace83626755a78c163357ba2.zip
Merge pull request #6037 from ewolinetz/logging_default_images
Automatic merge from submit-queue. Updating logging components image defaulting pattern Matches openshift_logging pattern and pattern used by other ansible components Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1505681
Diffstat (limited to 'roles/openshift_logging/vars')
-rw-r--r--roles/openshift_logging/vars/default_images.yml3
-rw-r--r--roles/openshift_logging/vars/openshift-enterprise.yml3
2 files changed, 0 insertions, 6 deletions
diff --git a/roles/openshift_logging/vars/default_images.yml b/roles/openshift_logging/vars/default_images.yml
deleted file mode 100644
index 1a77808f6..000000000
--- a/roles/openshift_logging/vars/default_images.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-__openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | default('docker.io/openshift/origin-') }}"
-__openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default('latest') }}"
diff --git a/roles/openshift_logging/vars/openshift-enterprise.yml b/roles/openshift_logging/vars/openshift-enterprise.yml
deleted file mode 100644
index f60fa8d7d..000000000
--- a/roles/openshift_logging/vars/openshift-enterprise.yml
+++ /dev/null
@@ -1,3 +0,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 ('v3.7') }}"