Juju Charms Collection
was-nd package

Merge lp:~geethas1/charms/trusty/was-nd/wasnd-fix into lp:~ibmcharmers/charms/trusty/was-nd/devel

  1. Trusty Tahr (14.04)
  2. wasnd-fix
  3. Merge into devel
Proposed by Geetha S
Status: Superseded
Proposed branch: lp:~geethas1/charms/trusty/was-nd/wasnd-fix
Merge into: lp:~ibmcharmers/charms/trusty/was-nd/devel
Diff against target: 81 lines (+10/-15)
2 files modified
hooks/config-changed (+10/-10)
tests/10-bundles-test.py (+0/-5)
To merge this branch: bzr merge lp:~geethas1/charms/trusty/was-nd/wasnd-fix
Reviewer Review Type Date Requested Status
vsr Pending
Review via email: mp+265816@code.launchpad.net

This proposal has been superseded by a proposal from 2015-07-28.

To post a comment you must log in.
lp:~geethas1/charms/trusty/was-nd/wasnd-fix updated
11. By Geetha S

Committing code changes for WAS ND

12. By Geetha S

Committing start/stop hook changes

13. By Geetha S

Committing reverse proxy test case

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/config-changed'
2--- hooks/config-changed 2015-07-24 11:50:42 +0000
3+++ hooks/config-changed 2015-07-28 10:24:43 +0000
4@@ -81,7 +81,7 @@
5 juju-log "IBM WAS ND: IBM IM exists "
6 remove_was_nd_software
7 else
8- juju-log "IBM WAS ND: IBM IM does not exists and hence exiting from WAS uninstalling"
9+ juju-log "IBM WAS ND: IBM IM does not exist and hence exiting from WAS uninstalling"
10 exit 0
11 fi
12 fi
13@@ -210,40 +210,40 @@
14
15 # Check integrity of downloaded package
16 if [ "$ARCHITECTURE" == "x86_64" ]; then
17- if [ "15d6d951324ad36e232349b613047625749df5cb" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/WASND_v8.5.5_1of3.zip | cut -d" " -f1`" ]; then
18+ if [ "15d6d951324ad36e232349b613047625749df5cb" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/$was_nd_pkg1 | cut -d" " -f1`" ]; then
19 juju-log "IBM WAS ND: IBM WAS ND package1 is corrupt."
20 exit 0
21 fi
22- if [ "012bf807821a828c7721eca5e7dfd5c0c15ea6b3" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/WASND_v8.5.5_2of3.zip | cut -d" " -f1`" ]; then
23+ if [ "012bf807821a828c7721eca5e7dfd5c0c15ea6b3" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/$was_nd_pkg2 | cut -d" " -f1`" ]; then
24 juju-log "IBM WAS ND: IBM WAS ND package2 is corrupt."
25 exit 0
26 fi
27- if [ "89c39c68c12420c3b84cbf4c284b27083dee9297" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/WASND_v8.5.5_3of3.zip | cut -d" " -f1`" ]; then
28+ if [ "89c39c68c12420c3b84cbf4c284b27083dee9297" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/$was_nd_pkg3 | cut -d" " -f1`" ]; then
29 juju-log "IBM WAS ND: IBM WAS ND package3 is corrupt."
30 exit 0
31 fi
32- if [ "895863b932334a78cccce6c73ec98d35ba98639b" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/8.5.5-WS-WAS-FP0000004-part1.zip | cut -d" " -f1`" ]; then
33+ if [ "895863b932334a78cccce6c73ec98d35ba98639b" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/$was_nd_fixpack1 | cut -d" " -f1`" ]; then
34 juju-log "IBM WAS ND: IBM WAS ND Fix Pack part1 is corrupt."
35 exit 0
36 fi
37- if [ "8f8560746c6fb0f87cd47801a014e7c34fccc4cc" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/8.5.5-WS-WAS-FP0000004-part2.zip | cut -d" " -f1`" ]; then
38+ if [ "8f8560746c6fb0f87cd47801a014e7c34fccc4cc" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/$was_nd_fixpack2 | cut -d" " -f1`" ]; then
39 juju-log "IBM WAS ND: IBM WAS ND Fix Pack part2 is corrupt."
40 exit 0
41 fi
42 elif [ "$ARCHITECTURE" == "ppc64le" ]; then
43- if [ "39eaa3f1f7a7ca69bfb86c38d0de06f4ae4d21b6" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/WAS_ND_V8.5.5_FOR_POWERLE_ML.zip | cut -d" " -f1`" ]; then
44+ if [ "39eaa3f1f7a7ca69bfb86c38d0de06f4ae4d21b6" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/$was_nd_ppc64le_pkg1 | cut -d" " -f1`" ]; then
45 juju-log "IBM WAS ND: IBM WAS ND package1 is corrupt."
46 exit 0
47 fi
48- if [ "6af7d0947da8c11657d135a467e5978d56bfd55e" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/WASND_V8.5.5_2OF_2_FOR_POWERLE_ML.zip | cut -d" " -f1`" ]; then
49+ if [ "6af7d0947da8c11657d135a467e5978d56bfd55e" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/$was_nd_ppc64le_pkg2 | cut -d" " -f1`" ]; then
50 juju-log "IBM WAS ND: IBM WAS ND package2 is corrupt."
51 exit 0
52 fi
53- if [ "c0f38a16b87b7e6e7c5c0f609fb3c1a61a3b7e8e" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/8.5.5-WS-WAS-LE-FP0000006-part1.zip | cut -d" " -f1`" ]; then
54+ if [ "c0f38a16b87b7e6e7c5c0f609fb3c1a61a3b7e8e" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/$was_nd_ppc64le_fixpack1 | cut -d" " -f1`" ]; then
55 juju-log "IBM WAS ND: IBM WAS ND Fix Pack part1 is corrupt."
56 exit 0
57 fi
58- if [ "c8fe75b915fa2ecd183af208eff7df0464342ff8" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/8.5.5-WS-WAS-LE-FP0000006-part2.zip | cut -d" " -f1`" ]; then
59+ if [ "c8fe75b915fa2ecd183af208eff7df0464342ff8" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/$was_nd_ppc64le_fixpack2 | cut -d" " -f1`" ]; then
60 juju-log "IBM WAS ND: IBM WAS ND Fix Pack part2 is corrupt."
61 exit 0
62 fi
63
64=== modified file 'tests/10-bundles-test.py'
65--- tests/10-bundles-test.py 2015-07-18 10:48:54 +0000
66+++ tests/10-bundles-test.py 2015-07-28 10:24:43 +0000
67@@ -43,14 +43,9 @@
68 with open(bundle_path, 'r') as bundle_file:
69 contents = yaml.safe_load(bundle_file)
70 d.load(contents)
71- d.add("haproxy")
72
73 # Software doesn't actually install until you accept the license
74 d.configure('was-nd', {'accept-ibm-was-nd-license': True, 'accept-ibm-im-license': True, 'was_nd_url': url, 'im_file_name': pkg })
75- d.configure('haproxy', {'enable_monitoring': True })
76- d.relate('haproxy:reverseproxy', 'was-nd:website')
77- d.expose('haproxy')
78- d.expose('was-nd')
79 d.setup(seconds_to_wait)
80 d.sentry.wait(seconds_to_wait)
81 cls.d = d

Subscribers

People subscribed via source and target branches

to all changes: