summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPino Toscano <ptoscano@redhat.com>2015-04-16 10:31:37 +0200
committerPino Toscano <ptoscano@redhat.com>2015-04-17 17:16:28 +0200
commitcea2cb1850fd17566c3bef0805179bffec6e7e91 (patch)
tree84382c1589025f486bdab2f12e65ae3e5c8bd797
parente1cac293a32ee1baf0cdbd49c2d73c930781a6a3 (diff)
Fix extjs.zip download URL2015.1.0rc22015.1.0
Switch to a different URL, found here [1], which works and point to the same ext-2.2.zip as used so far. [1] https://issues.cloudera.org/browse/DISTRO-476 Change-Id: I4a74c0d4d870683c4e4cc311736cd74349563fab Closes-Bug: #1444348 (cherry picked from commit 2d7defcacaa5c684e84e311a5438188d6d321de8)
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Sergey Lukjanov <slukjanov@mirantis.com> Workflow+1: Sergey Lukjanov <slukjanov@mirantis.com> Code-Review+2: Trevor McKay <tmckay@redhat.com> Code-Review+2: Michael McCune <msm@redhat.com> Submitted-by: Jenkins Submitted-at: Mon, 20 Apr 2015 09:23:38 +0000 Reviewed-on: https://review.openstack.org/174917 Project: openstack/sahara-image-elements Branch: refs/heads/stable/kilo
-rwxr-xr-xdiskimage-create/diskimage-create.sh2
-rw-r--r--elements/extjs/README.rst2
-rwxr-xr-xelements/extjs/install.d/80-install-extjs2
-rwxr-xr-xelements/extjs/root.d/50-download-extjs2
4 files changed, 4 insertions, 4 deletions
diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 62ec524..574d248 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -307,7 +307,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
307 export OOZIE_HADOOP_V1_DOWNLOAD_URL=${OOZIE_HADOOP_V1_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0.tar.gz"} 307 export OOZIE_HADOOP_V1_DOWNLOAD_URL=${OOZIE_HADOOP_V1_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0.tar.gz"}
308 export OOZIE_HADOOP_V2_6_DOWNLOAD_URL=${OOZIE_HADOOP_V2_6_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.1-hadoop-2.6.0.tar.gz"} 308 export OOZIE_HADOOP_V2_6_DOWNLOAD_URL=${OOZIE_HADOOP_V2_6_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.1-hadoop-2.6.0.tar.gz"}
309 export HADOOP_V2_6_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_6_NATIVE_LIBS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/hadoop-native-libs-2.6.0.tar.gz"} 309 export HADOOP_V2_6_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_6_NATIVE_LIBS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/hadoop-native-libs-2.6.0.tar.gz"}
310 export EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://extjs.com/deploy/ext-2.2.zip"} 310 export EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://dev.sencha.com/deploy/ext-2.2.zip"}
311 export HIVE_VERSION=${HIVE_VERSION:-"0.11.0"} 311 export HIVE_VERSION=${HIVE_VERSION:-"0.11.0"}
312 312
313 ubuntu_elements_sequence="base vm ubuntu hadoop oozie mysql hive $JAVA_ELEMENT" 313 ubuntu_elements_sequence="base vm ubuntu hadoop oozie mysql hive $JAVA_ELEMENT"
diff --git a/elements/extjs/README.rst b/elements/extjs/README.rst
index 31e5cb3..21388b8 100644
--- a/elements/extjs/README.rst
+++ b/elements/extjs/README.rst
@@ -20,7 +20,7 @@ The element can be configured by exporting variables using a
20* EXTJS\_DOWNLOAD\_URL 20* EXTJS\_DOWNLOAD\_URL
21 21
22 The URL from where to download extjs. Defaults to 22 The URL from where to download extjs. Defaults to
23 ``http://extjs.com/deploy/ext-2.2.zip``. 23 ``http://dev.sencha.com/deploy/ext-2.2.zip``.
24 24
25* EXTJS\_NO\_UNPACK 25* EXTJS\_NO\_UNPACK
26 26
diff --git a/elements/extjs/install.d/80-install-extjs b/elements/extjs/install.d/80-install-extjs
index b8a5280..23d4fbc 100755
--- a/elements/extjs/install.d/80-install-extjs
+++ b/elements/extjs/install.d/80-install-extjs
@@ -6,7 +6,7 @@ fi
6set -eu 6set -eu
7set -o pipefail 7set -o pipefail
8 8
9EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://extjs.com/deploy/ext-2.2.zip"} 9EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://dev.sencha.com/deploy/ext-2.2.zip"}
10 10
11extjs_archive=/tmp/$(basename $EXTJS_DOWNLOAD_URL) 11extjs_archive=/tmp/$(basename $EXTJS_DOWNLOAD_URL)
12 12
diff --git a/elements/extjs/root.d/50-download-extjs b/elements/extjs/root.d/50-download-extjs
index 4602424..036b4e9 100755
--- a/elements/extjs/root.d/50-download-extjs
+++ b/elements/extjs/root.d/50-download-extjs
@@ -6,7 +6,7 @@ fi
6set -eu 6set -eu
7set -o pipefail 7set -o pipefail
8 8
9EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://extjs.com/deploy/ext-2.2.zip"} 9EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://dev.sencha.com/deploy/ext-2.2.zip"}
10 10
11filename=$(basename $EXTJS_DOWNLOAD_URL) 11filename=$(basename $EXTJS_DOWNLOAD_URL)
12cached_package="$DIB_IMAGE_CACHE/$filename" 12cached_package="$DIB_IMAGE_CACHE/$filename"