Merge lp:~canonical-ci-engineering/charms/trusty/kibana/local-tarball into lp:charms/trusty/kibana

[Celso Providelo]

Supporting installation from local tarball payload, instead of fetching from the internet.

If files/kibana.tgz exists it will be used (no checksum checks).

[Whit Morriss (whitmo)]

LGTM +1. Please add some documentation to the README about said feature.

review: Approve

[lp:~canonical-ci-engineering/charms/trusty/kibana/local-tarball]

17. By Celso Providelo on 2015-03-31

Extend README to cover support for local payload.

[Celso Providelo (cprov)]

Whit,

Thanks for accepting this change, README was extended to cover the introduced feature.

[Whit Morriss (whitmo)]

Thanks!

-w

On Tue, Mar 31, 2015 at 11:06 AM, Celso Providelo <
<email address hidden>> wrote:

> Whit,
>
> Thanks for accepting this change, README was extended to cover the
> introduced feature.
> --
>
> https://code.launchpad.net/~canonical-ci-engineering/charms/trusty/kibana/local-tarball/+merge/254638
> You are reviewing the proposed merge of
> lp:~canonical-ci-engineering/charms/trusty/kibana/local-tarball into
> lp:charms/trusty/kibana.
>

--
---------------
D. Whit Morriss
Developer, Juju Ecosystem
Canonical USA

[Charles Butler (lazypower)]

Approved and released.

Thanks for the contribution!

review: Approve

=== modified file 'README.md'
--- README.md	2013-09-29 21:58:50 +0000
+++ README.md	2015-03-31 16:04:48 +0000
@@ -24,6 +24,22 @@
 
 browse to http://ip-address to begin searching.
 
+Installation
+------------
+
+Kibana source tarball will be downloaded and verified according to the
+configured values in 'kibana_source' and 'kibana_source_checksum', which
+default to::
+
+  https://download.elasticsearch.org/kibana/kibana/kibana-3.1.1.tar.gz
+
+It will, obviously, require internet access on deployed nodes.
+
+This behavior can be bypassed by providing `<charm>/files/kibana.tgz`
+payload prior deployment. The given payload will be used, without any
+checksum verification, but respecting the 'kibana_source_unpack_directory'.
+
+
 Configuration
 -------------
 

=== modified file 'hooks/install'
--- hooks/install	2015-03-06 15:37:51 +0000
+++ hooks/install	2015-03-31 16:04:48 +0000
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -eux
 HOME=$PWD
+KIBANA_TARBALL=files/kibana.tgz
 KIBANA_SOURCE=$(config-get kibana_source)
 KIBANA_SOURCE_UNPACK_DIRECTORY=$(config-get kibana_source_unpack_directory)
 KIBANA_SOURCE_CHECKSUM=$(config-get kibana_source_checksum)
@@ -10,10 +11,15 @@
 apt-get update
 apt-get install -y curl wget git nginx
 
-juju-log "download kibana from elasticsearch.org"
-wget -q -O /tmp/kibana.tgz ${KIBANA_SOURCE}
-echo "${KIBANA_SOURCE_CHECKSUM}  /tmp/kibana.tgz" > /tmp/kibana.tgz.sha1
-sha1sum -c /tmp/kibana.tgz.sha1
+if [! -f $KIBANA_TARBALL]; then
+    juju-log "download kibana from elasticsearch.org"
+    wget -q -O /tmp/kibana.tgz ${KIBANA_SOURCE}
+    echo "${KIBANA_SOURCE_CHECKSUM}  /tmp/kibana.tgz" > /tmp/kibana.tgz.sha1
+    sha1sum -c /tmp/kibana.tgz.sha1
+else
+    juju-log "using provided kibana tarball"
+    cp $KIBANA_TARBALL /tmp/kibana.tgz
+fi
 
 install -o root -g root -m 0644 files/charm/nginx.conf /etc/nginx/sites-available/kibana
 install -o root -g root -m 0644 files/charm/nginx_lb.conf /etc/nginx/sites-available/es_cluster