Merge lp:~stub/charms/trusty/cassandra/rsync-port into lp:charms/trusty/cassandra

[Stuart Bishop]

Open access to the rsync port.

This does nothing unless a subordinate is installing and configuring rsyncd, at which point it is a requirement. Since charms using ufw are in the minority, it seems better to open the point here in the Cassandra charm than require subordinates to somehow detect if ufw has been enabled and react appropriately.

(The nrpe port is already open for the same reasons)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1562/

review: Needs Fixing (automated testing)

[lp:~stub/charms/trusty/cassandra/rsync-port]

367. By Stuart Bishop on 2015-11-27

Fix firewall unit test

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1545/

review: Needs Fixing (automated testing)

[lp:~stub/charms/trusty/cassandra/rsync-port]

368. By Stuart Bishop on 2015-11-27

Merge test suite fixes from spike

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1576/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1578/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1559/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1561/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1668/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1648/

review: Approve (automated testing)

[Konstantinos Tsakalozos (kos.tsakalozos)]

The tests run for too long and this makes the review process rather hard. This patch is small enough to verify that is mostly harmless. Yet not being able to run the tests in reasonable times might be a blocker for larger patches.

In this particular case we are ok with the merge. Thank you for your time and effort.

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-10-22 04:50:10 +0000
+++ hooks/actions.py	2015-11-27 08:10:40 +0000
@@ -693,6 +693,7 @@
     # to control access.
     ufw.service('ssh', 'open')
     ufw.service('nrpe', 'open')  # Also NRPE for nagios checks.
+    ufw.service('rsync', 'open')  # Also rsync for data transfer and backups.
 
     # Clients need client access. These protocols are configured to
     # require authentication.

=== modified file 'tests/test_actions.py'
--- tests/test_actions.py	2015-09-10 07:22:22 +0000
+++ tests/test_actions.py	2015-11-27 08:10:40 +0000
@@ -857,6 +857,7 @@
         # SSH and the client protocol ports are always fully open.
         ufw.service.assert_has_calls([call('ssh', 'open'),
                                       call('nrpe', 'open'),
+                                      call('rsync', 'open'),
                                       call(9042, 'open'),
                                       call(9160, 'open')])
 

=== modified file 'tests/test_integration.py'
--- tests/test_integration.py	2015-08-19 09:57:40 +0000
+++ tests/test_integration.py	2015-11-27 08:10:40 +0000
@@ -187,7 +187,7 @@
 
     def get_client_relinfo(self, relname):
         # We only need one unit, even if rf > 1
-        s = self.deployment.sentry['cassandra/0']
+        s = self.deployment.sentry['cassandra'][0]
         relinfo = s.relation(relname, 'client:{}'.format(relname))
         return relinfo
 
@@ -287,11 +287,11 @@
         # and data migrated. Instead, keep checking until our condition
         # is met, or a timeout reached.
         timeout = time.time() + 300
-        for unit_num in range(0, self.rf):
-            unit = 'cassandra/{}'.format(unit_num)
+        for s in self.deployment.sentry['cassandra']:
+            unit = s.info['unit_name']
+            unit_num = s.info['unit']
             with self.subTest(unit=unit):
                 while True:
-                    s = self.deployment.sentry[unit]
                     # Attempting to diagnose Amulet failures. I suspect
                     # SSH host keys again, per Bug #802117
                     try:
@@ -354,7 +354,8 @@
                 self.assertIsInstance(fail, AuthenticationFailed)
 
     def test_cqlsh(self):
-        subprocess.check_output(['juju', 'ssh', 'cassandra/0',
+        unit = self.deployment.sentry['cassandra'][0].info['unit_name']
+        subprocess.check_output(['juju', 'ssh', unit,
                                  'sudo -H cqlsh -e exit'],
                                 stderr=subprocess.STDOUT)