summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/tasks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-20 13:18:50 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-20 13:18:50 -0500
commitca2e6af84b5d3f5239302348011b053c596a6ac6 (patch)
tree24bc02302fbe8d5a09c5ba3c66daacd784890151 /roles/openshift_examples/tasks
parent24f21d3115a1b25b93acef1d80509347117454c2 (diff)
parentcef52c3a1aabb10be8c1d4b81f37464982832105 (diff)
downloadopenshift-ca2e6af84b5d3f5239302348011b053c596a6ac6.tar.gz
openshift-ca2e6af84b5d3f5239302348011b053c596a6ac6.tar.bz2
openshift-ca2e6af84b5d3f5239302348011b053c596a6ac6.tar.xz
openshift-ca2e6af84b5d3f5239302348011b053c596a6ac6.zip
Merge pull request #929 from sdodson/fix-30-imagestreams
Install version dependent image streams for v1.0 and v1.1
Diffstat (limited to 'roles/openshift_examples/tasks')
-rw-r--r--roles/openshift_examples/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml
index 0b4784bae..9a5eebc66 100644
--- a/roles/openshift_examples/tasks/main.yml
+++ b/roles/openshift_examples/tasks/main.yml
@@ -1,8 +1,8 @@
---
- name: Copy openshift examples
copy:
- src: examples
- dest: /usr/share/openshift
+ src: "examples/{{ content_version }}/"
+ dest: "{{ examples_base }}/"
# RHEL and Centos image streams are mutually exclusive
- name: Import RHEL streams