diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-20 12:23:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 12:23:45 -0800 |
| commit | 898b43c24a0db0f53cd272de0f3dec2a32bbc34e (patch) | |
| tree | 99cb6240e59a7118b2b4c9be603efc7eaeaf4679 /roles/openshift_examples/defaults | |
| parent | a5de165b8e7113631a30ef0e4a20b5f74db073f0 (diff) | |
| parent | e6c159afb4ba39a7266c750d43d6a5e911cc8f21 (diff) | |
| download | openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.tar.gz openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.tar.bz2 openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.tar.xz openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.zip | |
Merge pull request #6516 from mgugino-upstream-stage/defact-is-containerized
Automatic merge from submit-queue.
Remove openshift.common.{is_atomic|is_containerized}
We set these variables using facts in init, no need
to duplicate the logic all around the codebase.
Diffstat (limited to 'roles/openshift_examples/defaults')
| -rw-r--r-- | roles/openshift_examples/defaults/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_examples/defaults/main.yml b/roles/openshift_examples/defaults/main.yml index e623b33f3..0a6e8f20c 100644 --- a/roles/openshift_examples/defaults/main.yml +++ b/roles/openshift_examples/defaults/main.yml @@ -8,7 +8,7 @@ openshift_examples_load_quickstarts: true content_version: "{{ openshift.common.examples_content_version }}" -examples_base: "{{ openshift.common.config_base if openshift.common.is_containerized | bool else '/usr/share/openshift' }}/examples" +examples_base: "{{ openshift.common.config_base if openshift_is_containerized | bool else '/usr/share/openshift' }}/examples" image_streams_base: "{{ examples_base }}/image-streams" centos_image_streams: - "{{ image_streams_base }}/image-streams-centos7.json" |