Merge lp:~alexlist/charms/trusty/nova-compute/nonstandard-authkeys-path into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Alexander List]

Allow configuring nonstandard authorized_keys path, including unit test, take two

[Liam Young (gnuoy)]

This looks good to me but please add a unit test(s) to test the new feature

review: Needs Fixing

[James Page (james-page)]

Please set back to 'Needs review' once unit tests added.

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_lint_check #1255 nova-compute-next for alexlist mp243152
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
INFO:root:command: make -f Makefile lint
ERROR:root:Make target returned non-zero.
  hooks/nova_compute_utils.py:408:1: E302 expected 2 blank lines, found 1
  unit_tests/test_nova_compute_hooks.py:333:25: E225 missing whitespace around operator
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9282789/
Build: http://10.98.191.181:8080/job/charm_lint_check/1255/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_unit_test #1089 nova-compute-next for alexlist mp243152
    UNIT OK: passed

UNIT Results (max last 5 lines):
  nova_compute_hooks 134 13 90% 79, 99-100, 127, 193, 251, 256-257, 263, 267-270
  nova_compute_utils 230 106 54% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 410-431, 448-458, 472-473, 478-479
  TOTAL 570 189 67%
  Ran 59 tests in 3.143s
  OK (SKIP=5)

Full unit test output: http://paste.ubuntu.com/9282790/
Build: http://10.98.191.181:8080/job/charm_unit_test/1089/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_amulet_test #558 nova-compute-next for alexlist mp243152
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/9283017/
Build: http://10.98.191.181:8080/job/charm_amulet_test/558/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-11-25 15:10:52 +0000
+++ config.yaml	2014-11-28 14:25:51 +0000
@@ -77,6 +77,15 @@
     description: |
       TCP authentication scheme for libvirt live migration.  Available options
       include ssh.
+  authorized-keys-path:
+    default: '{homedir}/.ssh/authorized_keys'
+    type: string
+    description: |
+      Only used when migration-auth-type is set to ssh.
+      Full path to authorized_keys file, can be useful for systems with non default
+      AuthorizedKeysFile location. It will be formatted using the following variables:
+          homedir - user's home directory
+          username - username
   # needed if using flatmanager
   bridge-interface:
     default: br100

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2014-09-30 07:40:06 +0000
+++ hooks/nova_compute_hooks.py	2014-11-28 14:25:51 +0000
@@ -86,10 +86,12 @@
         # Check-in with nova-c-c and register new ssh key, if it has just been
         # generated.
         initialize_ssh_keys()
+        import_authorized_keys()
 
     if config('enable-resize') is True:
         enable_shell(user='nova')
         initialize_ssh_keys(user='nova')
+        import_authorized_keys(user='nova', prefix='nova')
     else:
         disable_shell(user='nova')
 

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2014-10-02 12:57:11 +0000
+++ hooks/nova_compute_utils.py	2014-11-28 14:25:51 +0000
@@ -355,8 +355,9 @@
 
 
 def import_authorized_keys(user='root', prefix=None):
-    """Import SSH authorized_keys + known_hosts from a cloud-compute relation
-    and store in user's $HOME/.ssh.
+    """Import SSH authorized_keys + known_hosts from a cloud-compute relation.
+    Store known_hosts in user's $HOME/.ssh and authorized_keys in a path
+    specified using authorized-keys-path config option.
     """
     known_hosts = []
     authorized_keys = []
@@ -390,16 +391,20 @@
     #      be allowed ?
     if not len(known_hosts) or not len(authorized_keys):
         return
-    dest = os.path.join(pwd.getpwnam(user).pw_dir, '.ssh')
-    log('Saving new known_hosts and authorized_keys file to: %s.' % dest)
-    with open(os.path.join(dest, 'known_hosts'), 'wb') as _hosts:
+    homedir = pwd.getpwnam(user).pw_dir
+    dest_auth_keys = config('authorized-keys-path').format(
+        homedir=homedir, username=user)
+    dest_known_hosts = os.path.join(homedir, '.ssh/known_hosts')
+    log('Saving new known_hosts file to %s and authorized_keys file to: %s.' %
+        (dest_known_hosts, dest_auth_keys))
+
+    with open(dest_known_hosts, 'wb') as _hosts:
         for index in range(0, int(known_hosts_index)):
             _hosts.write('{}\n'.format(known_hosts[index]))
-    with open(os.path.join(dest, 'authorized_keys'), 'wb') as _keys:
+    with open(dest_auth_keys, 'wb') as _keys:
         for index in range(0, int(authorized_keys_index)):
             _keys.write('{}\n'.format(authorized_keys[index]))
 
-
 def do_openstack_upgrade():
     # NOTE(jamespage) horrible hack to make utils forget a cached value
     import charmhelpers.contrib.openstack.utils as utils

=== modified file 'unit_tests/test_nova_compute_hooks.py'
--- unit_tests/test_nova_compute_hooks.py	2014-06-24 13:44:41 +0000
+++ unit_tests/test_nova_compute_hooks.py	2014-11-28 14:25:51 +0000
@@ -329,6 +329,15 @@
             call(user='nova', prefix='nova'),
         ])
 
+    def test_compute_changed_nonstandard_authorized_keys_path(self):
+        self.migration_enabled.return_value = False
+        self.test_config.set('enable-resize', True)
+        hooks.compute_changed()
+        self.import_authorized_keys.assert_called_with(
+            user='nova',
+            prefix='nova',
+        )
+
     def test_ceph_joined(self):
         hooks.ceph_joined()
         self.apt_install.assert_called_with(['ceph-common'], fatal=True)

=== modified file 'unit_tests/test_nova_compute_utils.py'
--- unit_tests/test_nova_compute_utils.py	2014-11-28 10:20:05 +0000
+++ unit_tests/test_nova_compute_utils.py	2014-11-28 14:25:51 +0000
@@ -248,6 +248,12 @@
     def test_import_authorized_keys_prefix(self):
         self._test_import_authorized_keys_base(prefix='bar')
 
+    def test_import_authorized_keys_authkeypath(self):
+        nonstandard_path = '/etc/ssh/user-authorized-keys/{username}'
+        self.test_config.set('authorized-keys-path', nonstandard_path)
+        self._test_import_authorized_keys_base(
+            auth_key_path='/etc/ssh/user-authorized-keys/foo')
+
     @patch('subprocess.check_call')
     def test_import_keystone_cert_missing_data(self, check_call):
         self.relation_get.return_value = None