lp://staging/~landscape/landscape-charm/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp://staging/~landscape/landscape-charm/stable

Simon Poirier (community): Needs Resubmitting on 2021-04-14

Diff: 9376 lines (+5057/-1599) (has conflicts)

84 files modified

.bzrignore (+1/-2)
HACKING.md (+44/-13)
Makefile (+30/-21)
README.md (+46/-28)
actions.yaml (+5/-5)
charm-helpers.yaml (+1/-0)
charmhelpers/__init__.py (+76/-17)
charmhelpers/contrib/__init__.py (+11/-13)
charmhelpers/contrib/hahelpers/__init__.py (+11/-13)
charmhelpers/contrib/hahelpers/apache.py (+24/-20)
charmhelpers/contrib/hahelpers/cluster.py (+113/-23)
charmhelpers/core/__init__.py (+11/-13)
charmhelpers/core/decorators.py (+11/-13)
charmhelpers/core/files.py (+11/-13)
charmhelpers/core/fstab.py (+11/-13)
charmhelpers/core/hookenv.py (+548/-36)
charmhelpers/core/host.py (+602/-166)
charmhelpers/core/host_factory/centos.py (+72/-0)
charmhelpers/core/host_factory/ubuntu.py (+114/-0)
charmhelpers/core/hugepage.py (+11/-13)
charmhelpers/core/kernel.py (+34/-30)
charmhelpers/core/kernel_factory/centos.py (+17/-0)
charmhelpers/core/kernel_factory/ubuntu.py (+13/-0)
charmhelpers/core/services/__init__.py (+11/-13)
charmhelpers/core/services/base.py (+29/-20)
charmhelpers/core/services/helpers.py (+11/-13)
charmhelpers/core/strutils.py (+75/-18)
charmhelpers/core/sysctl.py (+32/-23)
charmhelpers/core/templating.py (+37/-25)
charmhelpers/core/unitdata.py (+19/-15)
charmhelpers/fetch/__init__.py (+53/-302)
charmhelpers/fetch/archiveurl.py (+12/-14)
charmhelpers/fetch/bzrurl.py (+42/-48)
charmhelpers/fetch/centos.py (+171/-0)
charmhelpers/fetch/giturl.py (+33/-33)
charmhelpers/fetch/python/__init__.py (+13/-0)
charmhelpers/fetch/python/debug.py (+54/-0)
charmhelpers/fetch/python/packages.py (+154/-0)
charmhelpers/fetch/python/rpdb.py (+56/-0)
charmhelpers/fetch/python/version.py (+32/-0)
charmhelpers/fetch/snap.py (+150/-0)
charmhelpers/fetch/ubuntu.py (+730/-0)
charmhelpers/osplatform.py (+25/-0)
config.yaml (+34/-0)
dev/charm_helpers_sync.py (+32/-24)
dev/deployer (+29/-30)
dev/ubuntu-deps (+13/-10)
hooks/install (+1/-1)
icon.svg (+1/-288)
lib/action.py (+1/-1)
lib/apt.py (+60/-26)
lib/bootstrap.py (+21/-15)
lib/callbacks/scripts.py (+48/-2)
lib/callbacks/tests/test_apt.py (+1/-1)
lib/callbacks/tests/test_scripts.py (+43/-2)
lib/paths.py (+1/-0)
lib/relations/haproxy.py (+57/-6)
lib/relations/hosted.py (+61/-2)
lib/relations/postgresql.py (+30/-35)
lib/relations/tests/test_haproxy.py (+175/-14)
lib/relations/tests/test_hosted.py (+148/-8)
lib/relations/tests/test_postgresql.py (+18/-17)
lib/services.py (+7/-3)
lib/tests/rootdir.py (+1/-1)
lib/tests/sample.py (+4/-3)
lib/tests/stubs.py (+19/-2)
lib/tests/test_apt.py (+69/-28)
lib/tests/test_bootstrap.py (+46/-13)
lib/tests/test_install.py (+6/-5)
lib/tests/test_services.py (+16/-4)
lib/tests/test_templates.py (+95/-0)
lib/tests/test_upgrade.py (+67/-4)
lib/tests/test_utils.py (+150/-1)
lib/utils.py (+71/-0)
metadata.yaml (+4/-0)
templates/landscape-server (+4/-0)
templates/service.conf (+21/-0)
tests/basic/test_actions.py (+1/-1)
tests/basic/test_ha.py (+21/-21)
tests/basic/test_leader.py (+2/-4)
tests/basic/test_service.py (+20/-3)
tests/helpers.py (+90/-38)
tests/layers.py (+11/-5)
tests/test_helpers.py (+2/-5)

api

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

408. By Simon Poirier on 2021-12-08

Merge 1682105_revisit_config [f=1499686,1682105] [r=landscape-builder,silverdrake11] [a=Simon Poirier]
Make proxy, system-email and root-url configurations updatable through the charm config.

Merged branch lp://staging/~simpoir/landscape-charm/1682105_revisit_config

Bug #1499686: system_email should be configurable

Bug #1682105: Charm configs don't get updated in database

407. By Linda Guo <email address hidden> on 2021-11-12

Merge bug-1934816 [f=1934816] [r=landscape-builder,simpoir,elmo] [a=Linda Guo]
Sync charm-helpers
Add relation: nrpe-external-master
Add nrpe checks check_systemd for landscape services

Merged branch lp://staging/~lihuiguo/landscape-charm/bug-1934816

Bug #1934816: landscape-server charm should implement nrpe-external-master relation to share Landscape endpoints

406. By Linda Guo <email address hidden> on 2021-10-29

Merge registration-relation [f=1945732] [r=landscape-builder,simpoir] [a=Linda Guo]
Add application-dashboard relation

  By adding application-dashboard relation in landscape charm,
  we can register landscape in Homer dashboard after
  creating relation between landscape charm and Homer charm

Merged branch lp://staging/~lihuiguo/landscape-charm/registration-relation

Bug #1945732: [feature] add registration relation to register landscape to Homer dashboard

405. By Simon Poirier on 2021-07-29

Merge juju-deploy-err [f=] [r=maxiberta] [a=Simon Poirier]
Replace juju-deployer by plain "juju deploy" in integration tests to allow testing on bionic.

Merged branch lp://staging/~simpoir/landscape-charm/juju-deploy-err

404. By Simon Poirier on 2021-07-23

Merge 1501803_ha_amqp [f=1501803] [r=maxiberta] [a=Simon Poirier]
Add all units to broker section with HA rabbitmq.

Merged branch lp://staging/~simpoir/landscape-charm/1501803_ha_amqp

Bug #1501803: All rabbitmq-server units should be listed in the [broker] section

403. By Simon Poirier on 2021-04-23

Merge landscape-charm [f=1923863] [r=simpoir] [a=mastier1]
add oidc-* options

402. By Simon Poirier on 2020-05-26

Merge pass_ping_through_https [f=1878265] [r=roadmr,landscape-builder] [a=Simon Poirier]
Add ping service to the https frontend in haproxy.

Merged branch lp://staging/~simpoir/landscape-charm/pass_ping_through_https

Bug #1878265: not able to change port for ping url

401. By Simon Poirier on 2020-02-27

Merge trivial_doc_updates [f=1846394,1864699] [r=landscape-builder,cjohnston,roadmr] [a=Simon Poirier]
Trivial documentation updates on config and actions.

Merged branch lp://staging/~simpoir/landscape-charm/trivial_doc_updates

Bug #1846394: Descriptions of pause and resume actions can be improved

Bug #1864699: license-file doc needs updated juju command

400. By Simon Poirier on 2019-10-21

Update to 19.10 release PPA

Merged branch lp://staging/~simpoir/landscape-charm/19.10_version

399. By Guillermo Gonzalez on 2019-07-26

use postgresql-charm v2 protocol, manually parse the dsn as the available psycopg2 (2.6.x) doesn't provide parse_dsn (added in 2.7.x)

Merged branch lp://staging/~verterok/landscape-charm/support-postgresql-charm-v2-protocol