Merge lp:~jjo/charms/trusty/mongodb/jjo-lp1274947-use_private-address_at_rs-initiate into lp:charms/trusty/mongodb

[JuanJo Ciarlante]

[lp:~jjo/charms/trusty/mongodb/jjo-lp1274947-use_private-address_at_rs-initiate]

55. By JuanJo Ciarlante on 2014-09-30

fix bracing for .format()

[JuanJo Ciarlante (jjo)]

Should cope with mongo rs.initiate() on hosts with 'invalid' hostname (see lp#1274947), I'm manually fixing them after deployment with: https://gist.github.com/jjo/198e27c8e44f68724fcd - this MP tries to implement that in-charm.

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #806 trusty-mongodb for jjo mp236599
    LINT FAIL: lint-check missing

LINT Results not found.
Build: http://10.98.191.181:8080/job/charm_lint_check/806/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #614 trusty-mongodb for jjo mp236599
    UNIT FAIL: unit-test missing

UNIT Results not found.
Build: http://10.98.191.181:8080/job/charm_unit_test/614/

[Cory Johns (johnsca)]

This seems fine to me, but I'm not clear how best to test this. Should I be able to replicate this on local provider, or does it require the MAAS bug? It would be best if we could "fudge" this enough to add a test case for this, but that seems like it would be difficult, if not impossible, to achieve.

Anyway, it doesn't seem to have any issues in the normal (non-bug) case, so it gets my +1.

review: Approve

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10466-results

review: Needs Fixing (automated testing)

[Mario Splivalo (mariosplivalo)]

This merge request was included here, as I needed it for fixing mongodb charm replicaset feature.

https://code.launchpad.net/~mariosplivalo/charms/trusty/mongodb/replsets-fix-try/+merge/243465

Unmerged revisions

55. By JuanJo Ciarlante on 2014-09-30

fix bracing for .format()

54. By JuanJo Ciarlante on 2014-09-30

[jjo] explicitly use private-address at rs.initiate()

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-08-20 23:48:43 +0000
+++ hooks/hooks.py	2014-09-30 20:28:11 +0000
@@ -345,7 +345,15 @@
         juju_log("init_replset: master_node must be defined.")
         retVal = False
     else:
-        retVal = mongo_client(master_node, 'rs.initiate()')
+        config_data = config()
+        # Use my IP at rs.initiate(), voids issues with invalid (and/or
+        # not resolvable by peers) hostnames
+        init_json = ('{{"_id": "{}", "members": '
+                     '[{{"_id": 0, "host": "{}:{}"}}]}}'.format(
+                         config_data['replicaset'],
+                         unit_get('private-address'),
+                         config_data['config_server_port']))
+        retVal = mongo_client(master_node, 'rs.initiate(%s)' % init_json)
     juju_log("init_replset returns: %s" % retVal)
     return(retVal)