Merge lp://staging/~caio1982/capomastro/stoppgsqlforrealz into lp://staging/capomastro
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~caio1982/capomastro/stoppgsqlforrealz |
| Merge into: | lp://staging/capomastro |
| Diff against target: |
1307 lines (+1124/-0) (has conflicts) 33 files modified
README (+155/-0) config.yaml (+71/-0) copyright (+17/-0) files/download-supported-job-types (+24/-0) grant_role_permissions.py (+35/-0) hooks/amqp-relation-changed (+22/-0) hooks/amqp-relation-departed (+4/-0) hooks/amqp-relation-joined (+4/-0) hooks/api-relation-changed (+38/-0) hooks/config-changed (+109/-0) hooks/db-relation-departed (+5/-0) hooks/db-relation-joined (+41/-0) hooks/install (+34/-0) hooks/nrpe-external-master-relation-changed (+46/-0) hooks/nrpe-external-master-relation-departed (+5/-0) hooks/nrpe-external-master-relation-joined (+10/-0) hooks/restart (+6/-0) hooks/start (+9/-0) hooks/stop (+9/-0) hooks/upgrade-charm (+3/-0) hooks/website-relation-changed (+6/-0) icon.svg (+293/-0) inc/common (+42/-0) metadata.yaml (+20/-0) nagios/capomastro_status.sh (+33/-0) nagios/check_status_file.sh (+26/-0) templates/capomastro_db_creation.tmpl (+11/-0) templates/capomastro_db_settings.tmpl (+10/-0) templates/capomastro_key_settings.tmpl (+3/-0) templates/capomastro_local_settings.tmpl (+22/-0) templates/nrpe_command_file.tmpl (+2/-0) templates/nrpe_service_file.tmpl (+8/-0) templates/nrpe_status_cron.tmpl (+1/-0) Conflict adding file README. Moved existing file to README.moved. |
| To merge this branch: | bzr merge lp://staging/~caio1982/capomastro/stoppgsqlforrealz |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One hackers | Pending | ||
|
Review via email:
|
|||
Commit message
This should hopefully help Capomastro not to loose its mind again if Postgresql is upgraded from the Debian package, thus being brought up suddenly and confusing the charm checks for DB relation. This has caused a bunch of HTTP 500s today. Axino found out the culprit.
Description of the change
This should hopefully help Capomastro not to loose its mind again if Postgresql is upgraded from the Debian package, thus being brought up suddenly and confusing the charm checks for DB relation. This has caused a bunch of HTTP 500s today. Axino found out the culprit.
Unmerged revisions
- 74. By Caio Begotti
-
force pgsql not to start or stop unless we really want to: this caused problems twice (at least) after pgsql got upgraded and its package simply used start.conf to decide when to bring it up inside the unit, thus breaking DB relation internally in capomastro config
- 73. By Caio Begotti
-
fix a quite probably typo
- 72. By Caio Begotti
-
fix the last bits mentioning the old PPA under ce-infra (now migrated to OLS too)
- 71. By Caio Begotti
-
Fix the sitename option of the charm so it's correctly used by the Nagios check, instead of having a hardcoded (legacy) hostname there.
- 70. By Caio Begotti
-
Update some of the mentions (if not all :-]) to the old PES team, to reflect the changes needed to put Capomastro under the OS umbrella. The spec will also be updated in a different MR.
- 69. By Caio Begotti
-
add the sitename option of the charm to capomastro's local settings so django picks it up.
- 68. By Caio Begotti
-
make pgrep check the whole processes command lines, otherwise we might miss a check (specially for celery)
- 67. By Caio Begotti
-
remove the now deprecated revision control file otherwise juju will not upgrade the charm at all
- 66. By Caio Begotti
-
merge the MTA settings that can be used as charm options, this way any deployment of capomastro can have a working notifications setup
- 65. By Caio Begotti
-
merge syntax fix
