Merge ~rjschwei/cloud-init:savePermFallback into cloud-init:master

[Robert Schweikert]

Fall back to root:root on syslog permissions if other options fail.

If the user has removed the default configuration file or does
not set the syslog_fix_perms config option the user still ends
up with a warning on SUSE distributions. Add root:root to the
default builtin config.

Add root:root to the default builtin config for syslog_fix_perms

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:1e9bf2e6e452158ff147888497b0ff11be62e33f
https://jenkins.ubuntu.com/server/job/cloud-init-ci/329/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/329/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

"save" or "safe" ?

review: Needs Information

[Scott Moser (smoser)]

> "save" or "safe" ?

@Robert,

If you just change this to 'safe', then i approve.

If you meant 'save', then please explain.

[Robert Schweikert (rjschwei)]

Fixed, thanks

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:d265168e405b23476f33a408b9d9b81c0a0ba0d6
https://jenkins.ubuntu.com/server/job/cloud-init-ci/331/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/331/rebuild

review: Approve (continuous-integration)

diff --git a/cloudinit/cmd/tests/test_main.py b/cloudinit/cmd/tests/test_main.py
index e2c54ae..a1e534f 100644
--- a/cloudinit/cmd/tests/test_main.py
+++ b/cloudinit/cmd/tests/test_main.py
@@ -125,7 +125,9 @@ class TestMain(FilesystemMockingTestCase):
             updated_cfg.update(
                 {'def_log_file': '/var/log/cloud-init.log',
                  'log_cfgs': [],
-                 'syslog_fix_perms': ['syslog:adm', 'root:adm', 'root:wheel'],
+                 'syslog_fix_perms': [
+                     'syslog:adm', 'root:adm', 'root:wheel', 'root:root'
+                 ],
                  'vendor_data': {'enabled': True, 'prefix': []}})
             updated_cfg.pop('system_info')
 
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
index ea367cb..b1ebaad 100644
--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
@@ -44,7 +44,7 @@ CFG_BUILTIN = {
     ],
     'def_log_file': '/var/log/cloud-init.log',
     'log_cfgs': [],
-    'syslog_fix_perms': ['syslog:adm', 'root:adm', 'root:wheel'],
+    'syslog_fix_perms': ['syslog:adm', 'root:adm', 'root:wheel', 'root:root'],
     'system_info': {
         'paths': {
             'cloud_dir': '/var/lib/cloud',