Merge lp://qastaging/~openstack-charmers/charms/precise/openstack-dashboard/ha-support into lp://qastaging/~charmers/charms/precise/openstack-dashboard/trunk
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 20 |
| Proposed branch: | lp://qastaging/~openstack-charmers/charms/precise/openstack-dashboard/ha-support |
| Merge into: | lp://qastaging/~charmers/charms/precise/openstack-dashboard/trunk |
| Diff against target: |
880 lines (+692/-29) 8 files modified
config.yaml (+59/-7) hooks/horizon-common (+53/-11) hooks/horizon-relations (+100/-7) hooks/lib/openstack-common (+456/-3) metadata.yaml (+6/-0) revision (+1/-1) scripts/add_to_cluster (+13/-0) scripts/remove_from_cluster (+4/-0) |
| To merge this branch: | bzr merge lp://qastaging/~openstack-charmers/charms/precise/openstack-dashboard/ha-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
* Updated for Grizzly.
* HA support via the hacluster subordinate.
To post a comment you must log in.
Revision history for this message
| Nobuto Murata (nobuto) wrote | # |
Revision history for this message
| Nobuto Murata (nobuto) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi, I'm not in the charmers group, but I found:
257 + if [ "$(config-get offline-
258 + set_or_update COMPRESS_OFFLINE False
259 + apt-get install -y nodejs node-less
260 + else
261 + set_or_update COMPRESS_OFFLINE True
262 + fi
Installing nodejs and node-less should be in "COMPRESS_OFFLINE True" not "COMPRESS_OFFLINE False", shouldn't it?