diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-04-19 15:13:03 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-04-19 15:13:03 -0400 |
| commit | 44d2a62e4d1756115d04e502aaa88aaef678cfed (patch) | |
| tree | f2a37034314977ac6fa367178e92fb18be42452d | |
| parent | 1f490c2374038669df3d2bfcb01af54361f8907e (diff) | |
| download | openshift-44d2a62e4d1756115d04e502aaa88aaef678cfed.tar.gz openshift-44d2a62e4d1756115d04e502aaa88aaef678cfed.tar.bz2 openshift-44d2a62e4d1756115d04e502aaa88aaef678cfed.tar.xz openshift-44d2a62e4d1756115d04e502aaa88aaef678cfed.zip | |
Use xpaas 1.3.0-1, use enterprise content for metrics
| -rwxr-xr-x | roles/openshift_examples/examples-sync.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_examples/examples-sync.sh b/roles/openshift_examples/examples-sync.sh index af388f6cf..7d81ac927 100755 --- a/roles/openshift_examples/examples-sync.sh +++ b/roles/openshift_examples/examples-sync.sh @@ -5,7 +5,7 @@ # # This script should be run from openshift-ansible/roles/openshift_examples -XPAAS_VERSION=ose-v1.3.0 +XPAAS_VERSION=ose-v1.3.0-1 ORIGIN_VERSION=${1:-v1.2} EXAMPLES_BASE=$(pwd)/files/examples/${ORIGIN_VERSION} find ${EXAMPLES_BASE} -name '*.json' -delete @@ -40,7 +40,7 @@ find application-templates-${XPAAS_VERSION}/ -name '*.json' ! -wholename '*secre wget https://raw.githubusercontent.com/jboss-fuse/application-templates/master/fis-image-streams.json -O ${EXAMPLES_BASE}/xpaas-streams/fis-image-streams.json wget https://raw.githubusercontent.com/openshift/origin-metrics/master/metrics.yaml -O ${EXAMPLES_BASE}/infrastructure-templates/origin/metrics-deployer.yaml -cp ${EXAMPLES_BASE}/infrastructure-templates/origin/metrics-*.yaml ${EXAMPLES_BASE}/infrastructure-templates/enterprise/ +wget https://raw.githubusercontent.com/openshift/origin-metrics/enterprise/metrics.yaml -O ${EXAMPLES_BASE}/infrastructure-templates/enterprise/metrics-deployer.yaml wget https://raw.githubusercontent.com/openshift/origin-aggregated-logging/master/deployment/deployer.yaml -O ${EXAMPLES_BASE}/infrastructure-templates/origin/logging-deployer.yaml wget https://raw.githubusercontent.com/openshift/origin-aggregated-logging/enterprise/deployment/deployer.yaml -O ${EXAMPLES_BASE}/infrastructure-templates/enterprise/logging-deployer.yaml |