Hello community, here is the log from the commit of package google-daemon for openSUSE:Factory checked in at 2016-02-24 14:25:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-daemon (Old) and /work/SRC/openSUSE:Factory/.google-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-daemon" Changes: -------- --- /work/SRC/openSUSE:Factory/google-daemon/google-daemon.changes 2016-02-05 00:32:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.google-daemon.new/google-daemon.changes 2016-02-24 14:25:45.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Feb 13 00:00:16 UTC 2016 - [email protected] + +- Update to version 1.3.2 (bsc#966582, bsc 966583) + + We are deprecating "sshKeys" in instance metadata. + + Support adding SSH keys to "ssh-keys" project metadata. + + Support adding SSH keys to "ssh-keys" instance metadata. + + Support "block-project-ssh-keys" in instance metadata. + + Set value to "true" to block project SSH key metadata. + + Using "sshKeys" in instance metadata will block project SSH keys. + +------------------------------------------------------------------- Old: ---- google-daemon-1.3.1.tar.bz2 New: ---- google-daemon-1.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-daemon.spec ++++++ --- /var/tmp/diff_new_pack.HcMgan/_old 2016-02-24 14:25:45.000000000 +0100 +++ /var/tmp/diff_new_pack.HcMgan/_new 2016-02-24 14:25:45.000000000 +0100 @@ -17,7 +17,7 @@ Name: google-daemon -Version: 1.3.1 +Version: 1.3.2 Release: 0 Summary: VM management inside GCE License: Apache-2.0 ++++++ google-daemon-1.3.1.tar.bz2 -> google-daemon-1.3.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/google-daemon-1.3.1/usr/share/google/google_daemon/desired_accounts.py new/google-daemon-1.3.2/usr/share/google/google_daemon/desired_accounts.py --- old/google-daemon-1.3.1/usr/share/google/google_daemon/desired_accounts.py 2016-01-20 19:41:29.000000000 +0100 +++ new/google-daemon-1.3.2/usr/share/google/google_daemon/desired_accounts.py 2016-02-10 20:30:39.000000000 +0100 @@ -157,8 +157,8 @@ # The metadata server content doesn't exist. Return None. # No need to log a warning. return None - # rethrow the exception since we don't know what it is. Let the - # top layer handle it + # Rethrow the exception since we don't know what it is. Let the + # top layer handle it. raise return None @@ -169,7 +169,7 @@ A dict of the form: {'username': ['sshkey1, 'sshkey2', ...]}. """ logging.debug('Getting desired accounts from metadata.') - # Fetch the top level attribute with a hanging get + # Fetch the top level attribute with a hanging get. metadata_content = self._GetMetadataUpdate() metadata_dict = json.loads(metadata_content or '{}') account_data = None @@ -177,15 +177,12 @@ try: instance_data = metadata_dict['instance']['attributes'] project_data = metadata_dict['project']['attributes'] - # Instance SSH keys that will override keys in project metadata. - instance_override = instance_data.get('override-ssh-keys') - instance_ssh = instance_data.get('sshKeys') - if instance_override or instance_ssh: - valid_keys = [instance_override, instance_ssh] - else: - valid_keys = [project_data.get('ssh-keys'), project_data.get('sshKeys')] - # Additional SSH keys the instance should accept. - valid_keys.append(instance_data.get('additional-ssh-keys')) + # Instance SSH keys to use regardless of project metadata. + valid_keys = [instance_data.get('sshKeys'), instance_data.get('ssh-keys')] + block_project = instance_data.get('block-project-ssh-keys', '').lower() + if block_project != 'true' and not instance_data.get('sshKeys'): + valid_keys.append(project_data.get('ssh-keys')) + valid_keys.append(project_data.get('sshKeys')) valid_keys = [key for key in valid_keys if key] account_data = '\n'.join(valid_keys) except KeyError:
