diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-10 15:58:00 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-10 15:58:00 -0500 |
| commit | 6ee3d4deb200219098596562e502ca34e550f6fd (patch) | |
| tree | bef03951221471cc0e93bb8b04d21d4355d3ca98 /roles/openshift_examples/tasks | |
| parent | 1735585f0a1f0ff510f359b3f86fc80d04182d01 (diff) | |
| parent | 36d44c4b8bb2e3059b67dea7ddb67f7bbaf921e4 (diff) | |
| download | openshift-6ee3d4deb200219098596562e502ca34e550f6fd.tar.gz openshift-6ee3d4deb200219098596562e502ca34e550f6fd.tar.bz2 openshift-6ee3d4deb200219098596562e502ca34e550f6fd.tar.xz openshift-6ee3d4deb200219098596562e502ca34e550f6fd.zip | |
Merge pull request #857 from sosiouxme/20151110-infrastructure-templates
examples: include logging and metrics infrastructure
Diffstat (limited to 'roles/openshift_examples/tasks')
| -rw-r--r-- | roles/openshift_examples/tasks/main.yml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml index 40b7a5d6e..f48e207e7 100644 --- a/roles/openshift_examples/tasks/main.yml +++ b/roles/openshift_examples/tasks/main.yml @@ -37,6 +37,22 @@ failed_when: "'already exists' not in oex_import_quickstarts.stderr and oex_import_quickstarts.rc != 0" changed_when: false +- name: Import origin infrastructure-templates + command: > + {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ infrastructure_origin_base }} + when: openshift_examples_load_centos | bool + register: oex_import_infrastructure + failed_when: "'already exists' not in oex_import_infrastructure.stderr and oex_import_infrastructure.rc != 0" + changed_when: false + +- name: Import enterprise infrastructure-templates + command: > + {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ infrastructure_enterprise_base }} + when: openshift_examples_load_rhel | bool + register: oex_import_infrastructure + failed_when: "'already exists' not in oex_import_infrastructure.stderr and oex_import_infrastructure.rc != 0" + changed_when: false + - name: Import xPaas image streams command: > |