Juju Charms Collection
mysql package

Merge lp:~james-page/charms/precise/mysql/remove-socket-fqdn into lp:charms/mysql

  1. Precise Pangolin (12.04)
  2. remove-socket-fqdn
  3. Merge into trunk
Proposed by James Page
Status: Merged
Merged at revision: 100
Proposed branch: lp:~james-page/charms/precise/mysql/remove-socket-fqdn
Merge into: lp:charms/mysql
Diff against target: 19 lines (+2/-2)
2 files modified
hooks/shared_db_relations.py (+1/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~james-page/charms/precise/mysql/remove-socket-fqdn
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email: mp+167723@code.launchpad.net

Description of the change

Remove use of socket.fqdn from shared-db hooks

This assumes that DNS resolution is going to be working and infact should
be using unit-get private-address.

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

Thanks for this fix up. LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/shared_db_relations.py'
2--- hooks/shared_db_relations.py 2013-03-15 15:47:24 +0000
3+++ hooks/shared_db_relations.py 2013-06-06 09:24:31 +0000
4@@ -74,7 +74,7 @@
5 return
6
7 settings = relation_get()
8- local_hostname = socket.getfqdn()
9+ local_hostname = utils.unit_get('private-address')
10 singleset = set([
11 'database',
12 'username',
13
14=== modified file 'revision'
15--- revision 2013-04-10 01:21:56 +0000
16+++ revision 2013-06-06 09:24:31 +0000
17@@ -1,1 +1,1 @@
18-306
19+307

Subscribers

People subscribed via source and target branches

to all changes: