Juju Charms Collection
postgresql package

Merge lp://staging/charms/postgresql into lp://staging/~richard-asbridge/charms/precise/postgresql/postgresql-admin-ip

Precise Pangolin (12.04)
trunk
Merge into postgresql-admin-ip

Proposed by Richard Asbridge on 2013-09-10

Status:

Superseded

Proposed branch:

lp://staging/charms/postgresql

Merge into:

lp://staging/~richard-asbridge/charms/precise/postgresql/postgresql-admin-ip

Diff against target:

0 lines

To merge this branch:

bzr merge lp://staging/charms/postgresql

Related bugs:

Bug #1329816: Nagios for age of backup.log fails initially	Low	Fix Released
Bug #1384894: Tests Fail Consistently	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Marco Ceppi (community)			Needs Resubmitting on 2013-09-10
Richard Asbridge			Pending
Review via email: mp+184770@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2013-09-10.

Description of the change

I added a new config option called admin_ip that defaults to "none" when this option is set using the usual "juju set" command, it causes the given IP address to be added to the pg_hba.conf file in the following manner...

host all all 10.0.3.1 md5

...if admin_ip is left unconfigured then it has no effect.

This is handy for developers using juju in local mode where they want to connect tools such as pgAdmin from their host machine to the postgres instances running inside of juju.

Revision history for this message

Marco Ceppi (marcoceppi) wrote on 2013-09-10:

Please resubmit with the merge into branch being "lp:charms/postgresql" and the proposed branch "lp:~richard-asbridge/charms/precise/postgresql/postgresql-admin-ip"

review: Needs Resubmitting

lp://staging/charms/postgresql updated on 2015-11-12

64. By Stuart Bishop on 2013-09-16: merging lp:~patrick-hetu/charms/precise/postgresql/fix-1224668 as per https://code.launchpad.net/~patrick-hetu/charms/precise/postgresql/fix-1224668/+merge/185643
65. By Stuart Bishop on 2013-09-26: merging lp:~richard-asbridge/charms/precise/postgresql/postgresql-admin-ip as per https://code.launchpad.net/~richard-asbridge/charms/precise/postgresql/postgresql-admin-ip/+merge/184789
66. By Stuart Bishop on 2013-10-03: Merging lp:~yolanda.robla/charms/precise/postgresql/fix_tabs per https://code.launchpad.net/~yolanda.robla/charms/precise/postgresql/fix_tabs/+merge/189057
67. By Tom Haddon on 2013-10-09: [thedac,r=mthaddon] Re-enable nrpe-external-master hook
68. By Stuart Bishop on 2013-10-10: Merge lp:~stub/charms/precise/postgresql/cleanups per https://code.launchpad.net/~stub/charms/precise/postgresql/cleanups/+merge/190332 and https://code.launchpad.net/~stub/charms/precise/postgresql/charm-helpers/+merge/190077
69. By Stuart Bishop on 2013-10-10: Merge lp:~stub/charms/precise/postgresql/cleanups per https://code.launchpad.net/~stub/charms/precise/postgresql/cleanups/+merge/190473
70. By Stuart Bishop on 2013-10-14: Merge lp:~stub/charms/precise/postgresql/cleanups per https://code.launchpad.net/~stub/charms/precise/postgresql/cleanups/+merge/190644
71. By Tom Haddon on 2013-10-14: [liam,r=mthaddon] Add nagios user and pgpass file in nrpe-external-master relation to allow nagios pg check to run
72. By Marco Ceppi on 2013-11-03: [stub] Breakout test fixture into its own package. Implement reuse of machines for fast test runs.
73. By Marco Ceppi on 2013-11-03: [stub] Add a test for the admin_addresses configuration option.
74. By Marco Ceppi on 2013-11-17: [stub] filter_installed_packages was not filtering metapackages, so charm was failing if the postgresql package was already installed. Fix this by using the explicit PostgreSQL version, which will also be needed to reenable multiple PG version support.
[stub] Typo in the config.yaml, and improved the description.
75. By Stuart Bishop on 2013-11-19: Merge lp:~ahasenack/charms/precise/postgresql/postgresql-avoid-cname per https://code.launchpad.net/~ahasenack/charms/precise/postgresql/postgresql-avoid-cname/+merge/195283
76. By Marco Ceppi on 2014-01-07: [stub] Tidy, document and test the 'roles' relationship parameter.
77. By Stuart Bishop on 2014-01-08: Fix manual performance tuning kerel settings, cleanups and unittest framework. Merge lp:~chad.smith/charms/precise/postgresql/postgresql-manual-tune-kernel-params-fix per https://code.launchpad.net/~chad.smith/charms/precise/postgresql/postgresql-manual-tune-kernel-params-fix/+merge/200730
78. By Jorge Castro on 2014-01-14: Some small tweaks as part of the charm audit.
79. By Marco Ceppi on 2014-01-16: [stub] Fix some drift from trunk in the brand new unit tests.
80. By Stuart Bishop on 2014-01-21: PostgreSQL 9.3 support, merge lp:~jjo/charms/precise/postgresql/support-no-explicit-version_and_trusty-pg93 per https://code.launchpad.net/~jjo/charms/precise/postgresql/support-no-explicit-version_and_trusty-pg93/+merge/202076
81. By Stuart Bishop on 2014-01-22: Experimental SwiftWAL PITR support, per https://code.launchpad.net/~stub/charms/precise/postgresql/use-swiftwal/+merge/199942
82. By Stuart Bishop on 2014-01-22: Put back execute permission on hooks/hooks.py
83. By Stuart Bishop on 2014-01-31: [ahasenack] Avoid createdb race conditions by not connecting to the template1 database
84. By Stuart Bishop on 2014-02-04: [ahasenack] Include streaming_replication when writing out the recovery.conf file so that primary_conninfo gets added to it and replication can work. Per https://code.launchpad.net/~ahasenack/charms/precise/postgresql/postgresql-fix-recovery-conf/+merge/204576
85. By Marco Ceppi on 2014-02-13: [stub] Remove an unused helper and fix some edge cases in the relation-broken hooks.
86. By Marco Ceppi on 2014-02-13: [stub] Run tests for all supported versions of PostgreSQL.
87. By Marco Ceppi on 2014-02-18: [stub] Fix for Bug #1278731.
88. By Marco Ceppi on 2014-03-04: [stub] Ship PostgreSQL log files via syslog.
89. By Darren Spiteri on 2014-03-04: [dames,r=dspiteri] Allow nagios to check postgres with check_pgsql
90. By Liam Young on 2014-04-04: [stub,r=gnuoy] Don't check postgresql_stop's error code, as it doesn't have one
91. By <email address hidden> on 2014-04-28: [stub] Minor cleanups. The bulk of this MP is updating the backup script, pulling in a more recent copy from our internal branches.
92. By <email address hidden> on 2014-04-28: [stub] The test suite started failing with recent juju releases; the technique of piping commands to 'juju ssh' was fragile.
93. By <email address hidden> on 2014-04-28: [stub] Tune the database using the pgtune tool, rather than attempt to reproduce its logic ourselves.
94. By <email address hidden> on 2014-04-28: [stub] Rework tests and fix bugs to get the failover tests running reliably. G 9.1 tests now complete, except for syslog due to Bug #1301361 (maybe others will have better luck)
95. By Stuart Bishop on 2014-05-07: [thedac] Package holding & nagios fixes, per https://code.launchpad.net/~thedac/charms/precise/postgresql/package-holding/+merge/216411
96. By Stuart Bishop on 2014-05-16: [hackedbellini] More tuning options, per https://code.launchpad.net/~hackedbellini/charms/precise/postgresql/extra_options/+merge/219057
97. By Stuart Bishop on 2014-05-20: [hackedbellini] Allow inclusion of arbitrary pg_hba.conf stanzas for arbitrary access control restrictions, per https://code.launchpad.net/~hackedbellini/charms/precise/postgresql/development_options/+merge/219058
98. By Stuart Bishop on 2014-05-29: [chad.smith] Use storage broker and storage subordinate charm for non-ephemeral disk, per https://code.launchpad.net/~chad.smith/charms/precise/postgresql/postgresql-using-storage-subordinate/+merge/206078
99. By Marco Ceppi on 2014-06-26: [stub] PostgreSQL 9.4 (beta) support. Because.
100. By Marco Ceppi on 2014-06-26: [stub] Allow running of tests in different series, both precise and trusty.
101. By Stuart Bishop on 2014-07-08: [stub] Initialize backup log file on install to silence spurious nagios alert, per https://code.launchpad.net/~stub/charms/precise/postgresql/bug-1329816-backup-log-spurious-alert/+merge/223210
102. By Stuart Bishop on 2014-09-22: [joetalbott] Ensure client credentials are up-to-date after an external mountpoint is mounted.
103. By Stuart Bishop on 2014-10-01: [ev] Make sysctl call (for tuning kernel parameters) non-fatal
104. By Stuart Bishop on 2014-10-08: [aisrael] Lint fixes
105. By Charles Butler on 2014-10-23: [R=lazypower,S=Stub] Stuart Bishop 2014-10-14 Ignore magic synced charmhelpers
    Stuart Bishop 2014-10-14 Allow charm store charms, fixing rsyslog test
    Stuart Bishop 2014-10-14 [merge] Embed test client charm and remove JUJU_REPOSITORY requirement
    Stuart Bishop 2014-10-14 Embed test client charm and remove requirement of JUJU_REPOSITORY bei...
    Stuart Bishop 2014-10-07 [merge] Merged test-upgrade-charm into data-checksums.
    Stuart Bishop 2014-10-07 [merge] Merged wal-e into test-upgrade-charm.
    Stuart Bishop 2014-10-07 [merge] Merged bug-1276024-fix-log-shipping into wal-e.
    Stuart Bishop 2014-10-07 [merge] Merged bug-1281600-log_temp_files into bug-1276024-fix-log-sh...
    Stuart Bishop 2014-10-07 [merge] Merged bug-1329816-backup-log-spurious-alert into bug-1281600...
    Stuart Bishop 2014-10-07 [merge] Merged tests into bug-1329816-backup-log-spurious-alert.
    Stuart Bishop 2014-10-07 [merge] Merged cleanups into tests.
    Stuart Bishop 2014-10-07 [merge] Merged charm-helpers into cleanups.
    Stuart Bishop 2014-10-07 [merge] Merged trunk-dev into charm-helpers.
    Stuart Bishop 2014-10-07 [merge] Merged postgresql into trunk-dev.
    Stuart Bishop 2014-09-23 [merge] Merged test-upgrade-charm into data-checksums.
    Stuart Bishop 2014-09-23 [merge] Merged wal-e into test-upgrade-charm.
    Stuart Bishop 2014-09-23 [merge] Merged bug-1276024-fix-log-shipping into wal-e.
    Stuart Bishop 2014-09-23 [merge] Merged bug-1281600-log_temp_files into bug-1276024-fix-log-sh...
    Stuart Bishop 2014-09-23 [merge] Merged bug-1329816-backup-log-spurious-alert into bug-1281600...
    Stuart Bishop 2014-09-23 [merge] Merged tests into bug-1329816-backup-log-spurious-alert.
    Stuart Bishop 2014-09-23 [merge] Merged cleanups into tests.
    Stuart Bishop 2014-09-23 [merge] Merged charm-helpers into cleanups.
    Stuart Bishop 2014-09-23 [merge] Merged trunk-dev into charm-helpers.
    Stuart Bishop 2014-09-23 [merge] Merged postgresql into trunk-dev.
    Stuart Bishop 2014-10-10 Make hooks.py executable
    Stuart Bishop 2014-10-08 [merge] Merge trunk
    Stuart Bishop 2014-10-03 Fix failing tests
    Stuart Bishop 2014-10-02 Better guarding on credentials resetting
    Stuart Bishop 2014-10-02 Don't introspect relations we haven't joined yet
    Stuart Bishop 2014-10-02 [merge] Merge trunk
    Stuart Bishop 2014-10-02 Review feedback
    Stuart Bishop 2014-09-23 Split full test run
    Stuart Bishop 2014-09-22 Timeouts
    Stuart Bishop 2014-09-22 Do not attempt to publish client connection details until the master ...
    Stuart Bishop 2014-09-19 timings
    Stuart Bishop 2014-09-19 Increase timeout, and ignore all failures of juju-run commands since ...
    Stuart Bishop 2014-09-19 [merge] delint
    Adam Israel 2014-09-17 Fix lint errors
    Stuart Bishop 2014-09-08 [merge] Merge development pipeline up to data-checksums
    Stuart Bishop 2014-08-27 [merge] Merged test-upgrade-charm into data-checksums.
    Stuart Bishop 2014-08-27 [merge] Merged wal-e into test-upgrade-charm.
    Stuart Bishop 2014-08-27 [merge] Merged bug-1276024-fix-log-shipping into wal-e.
    Stuart Bishop 2014-08-27 [merge] Merged bug-1281600-log_temp_files into bug-1276024-fix-log-sh...
    Stuart Bishop 2014-08-27 [merge] Merged bug-1329816-backup-log-spurious-alert into bug-1281600...
    Stuart Bishop 2014-08-27 [merge] Merged tests into bug-1329816-backup-log-spurious-alert.
    Stuart Bishop 2014-08-27 [merge] Merged cleanups into tests.
    Stuart Bishop 2014-08-27 [merge] Merged charm-helpers into cleanups.
    Stuart Bishop 2014-08-27 Add missing charm-helpers files
    Stuart Bishop 2014-08-27 [merge] Merged test-upgrade-charm into data-checksums.
    Stuart Bishop 2014-08-27 [merge] Merged wal-e into test-upgrade-charm.
    Stuart Bishop 2014-08-27 [merge] Merged bug-1276024-fix-log-shipping into wal-e.
    Stuart Bishop 2014-08-27 [merge] Merged bug-1281600-log_temp_files into bug-1276024-fix-log-sh...
    Stuart Bishop 2014-08-27 [merge] Merged bug-1329816-backup-log-spurious-alert into bug-1281600...
    Stuart Bishop 2014-08-27 [merge] Merged tests into bug-1329816-backup-log-spurious-alert.
    Stuart Bishop 2014-08-27 [merge] Merged cleanups into tests.
    Stuart Bishop 2014-08-27 [merge] Merged charm-helpers into cleanups.
    Stuart Bishop 2014-08-27 [merge] Merged trunk-dev into charm-helpers.
    Stuart Bishop 2014-08-27 [merge] Merged postgresql into trunk-dev.
    Stuart Bishop 2014-08-27 [merge] Merged test-upgrade-charm into data-checksums.
    Stuart Bishop 2014-08-27 [merge] Merged wal-e into test-upgrade-charm.
    Stuart Bishop 2014-08-27 [merge] Merged bug-1276024-fix-log-shipping into wal-e.
    Stuart Bishop 2014-08-27 [merge] Merged bug-1281600-log_temp_files into bug-1276024-fix-log-sh...
    Stuart Bishop 2014-08-27 [merge] Merged bug-1329816-backup-log-spurious-alert into bug-1281600...
    Stuart Bishop 2014-08-27 [merge] Merged tests into bug-1329816-backup-log-spurious-alert.
    Stuart Bishop 2014-08-27 [merge] Merged cleanups into tests.
    Stuart Bishop 2014-08-27 [merge] Merged charm-helpers into cleanups.
    Stuart Bishop 2014-08-27 Update charm-helpers, really
    Stuart Bishop 2014-08-27 Update charm-helpers branch
    Stuart Bishop 2014-08-27 [merge] Merged test-upgrade-charm into data-checksums.
    Stuart Bishop 2014-08-27 [merge] Merged wal-e into test-upgrade-charm.
    Stuart Bishop 2014-08-27 [merge] Merged bug-1276024-fix-log-shipping into wal-e.
    Stuart Bishop 2014-08-27 [merge] Resolve conflicts
    Stuart Bishop 2014-08-27 [merge] Merged bug-1329816-backup-log-spurious-alert into bug-1281600...
    Stuart Bishop 2014-08-27 [merge] Merged tests into bug-1329816-backup-log-spurious-alert.
    Stuart Bishop 2014-08-27 [merge] Merged cleanups into tests.
    Stuart Bishop 2014-08-27 [merge] Merged charm-helpers into cleanups.
    Stuart Bishop 2014-08-27 Update charm-helpers
    Stuart Bishop 2014-08-27 charm-helpers sync target
    Stuart Bishop 2014-06-30 Unused and incorrect global
    Stuart Bishop 2014-06-30 Dead code
    Stuart Bishop 2014-06-30 Dead code
    Stuart Bishop 2014-08-23 Turn on data checksums by default for new PG 9.3+ installations
    Stuart Bishop 2014-08-22 [merge] Merged wal-e into test-upgrade-charm.
    Stuart Bishop 2014-08-21 Document experimental wal-e support
    Stuart Bishop 2014-08-07 Test upgrade-charm does not reset the database
    Stuart Bishop 2014-07-14 delint
    Stuart Bishop 2014-07-14 Cope when config items are not set
    Stuart Bishop 2014-07-07 WAL-E Swift tests passing
    Stuart Bishop 2014-07-04 WIP
    Stuart Bishop 2014-07-04 WAL-E support, WIP
    Stuart Bishop 2014-07-02 SwiftWAL tweaks and a test
    Stuart Bishop 2014-07-01 Manual runs working
    Stuart Bishop 2014-06-30 WIP
    Stuart Bishop 2014-06-30 [merge] Merged bug-1329816-backup-log-spurious-alert into bug-1281600...
    Stuart Bishop 2014-06-27 [merge] Merged bug-1329816-backup-log-spurious-alert into bug-1281600...
    Stuart Bishop 2014-06-27 [merge] Merged bug-1329816-backup-log-spurious-alert into bug-1281600...
    Stuart Bishop 2014-06-24 Add log_temp_files configuration option
106. By Marco Ceppi on 2014-11-04: [stub] Minimize tests for test runner
107. By Stuart Bishop on 2014-11-11: [james-w] Publish statsd metrics, per https://code.launchpad.net/~james-w/charms/precise/postgresql/metrics/+merge/231322
108. By Stuart Bishop on 2014-11-17: [bradm] Fix scheduled backup task
109. By Tim Van Steenburgh on 2014-11-19: [stub] Document permissions best practice
110. By Stuart Bishop on 2014-12-20: delint
111. By Charles Butler on 2015-01-13:     [r=lazypower]Stuart Bishop 2014-12-05 [merge] Merge trunk
    Stuart Bishop 2014-11-04 Publish credentials if manually replicated hot standby, even if th...
    Stuart Bishop 2014-11-04 Manual replication mode
112. By Stuart Bishop on 2015-02-09: [pjcd, r=stub] Stop unconditionally restarting PostgreSQL on upgrade-charm
113. By Stuart Bishop on 2015-02-09: [pjcd, r=stub] Nagios updates and fixes
114. By Stuart Bishop on 2015-02-10: [pjcd, r=stub] update_nrpe_checks(): fetch nagios_hostname from nrpe-external-master relation
115. By Stuart Bishop on 2015-02-12: [pjcd, r=stub] default_statistics_target: new config item; and use it
116. By Stuart Bishop on 2015-03-09: [caio1982, r=stub] Handle stale package database with local provider
117. By Stuart Bishop on 2015-03-09: [stub] Fix unittests
118. By Marco Ceppi on 2015-03-24: [stub] Add some tunables needed for Launchpad and Landscape deployments. Also remove a config item that has done nothing for ages, and remove beta comments about the no-longer beta PostgreSQL 9.4.
119. By Stuart Bishop on 2015-05-07: [michael.nelson, r=stub] Fix permissions on installed statsd script
120. By Stuart Bishop on 2015-05-07: [stub] Fix SQL string quoting in postgres_to_statsd.py
121. By Stuart Bishop on 2015-06-24: [dangyogi, r=stub] Allow clients to request extensions to be created in their databases
122. By Stuart Bishop on 2015-06-25: lint
123. By Stuart Bishop on 2015-07-03: [dangyogi, r=stub] Don't automatically drop extensions
124. By Stuart Bishop on 2015-07-03: delint
125. By Stuart Bishop on 2015-07-03: Fix hook permission
126. By Matt Bruzek on 2015-11-11: [stub] A rewrite to make use of modern Juju and improve postgresql reliability in automated testing.
127. By Stuart Bishop on 2015-11-12: Revert r126, as python3 is not available on default preciseinstalls

Unmerged revisions

127. By Stuart Bishop on 2015-11-12: Revert r126, as python3 is not available on default preciseinstalls
126. By Matt Bruzek on 2015-11-11: [stub] A rewrite to make use of modern Juju and improve postgresql reliability in automated testing.
125. By Stuart Bishop on 2015-07-03: Fix hook permission
124. By Stuart Bishop on 2015-07-03: delint
123. By Stuart Bishop on 2015-07-03: [dangyogi, r=stub] Don't automatically drop extensions
122. By Stuart Bishop on 2015-06-25: lint
121. By Stuart Bishop on 2015-06-24: [dangyogi, r=stub] Allow clients to request extensions to be created in their databases
120. By Stuart Bishop on 2015-05-07: [stub] Fix SQL string quoting in postgres_to_statsd.py
119. By Stuart Bishop on 2015-05-07: [michael.nelson, r=stub] Fix permissions on installed statsd script
118. By Marco Ceppi on 2015-03-24: [stub] Add some tunables needed for Launchpad and Landscape deployments. Also remove a config item that has done nothing for ages, and remove beta comments about the no-longer beta PostgreSQL 9.4.