Merge pull request #4 from zdc/T2117

Cloud-init: T2117: Updated to 20.1 version

1 files changed, 8 insertions, 5 deletions

diff --git a/cloudinit/config/cc_salt_minion.py b/cloudinit/config/cc_salt_minion.py
index d6a21d72..5dd8de37 100644
--- a/cloudinit/config/cc_salt_minion.py
+++ b/cloudinit/config/cc_salt_minion.py
@@ -45,7 +45,9 @@ specify them with ``pkg_name``, ``service_name`` and ``config_dir``.
 
 import os
 
-from cloudinit import util
+from cloudinit import safeyaml, util
+from cloudinit.distros import rhel_util
+
 
 # Note: see https://docs.saltstack.com/en/latest/topics/installation/
 # Note: see https://docs.saltstack.com/en/latest/ref/configuration/
@@ -59,7 +61,7 @@ class SaltConstants(object):
 
         # constants tailored for FreeBSD
         if util.is_FreeBSD():
-            self.pkg_name = 'py27-salt'
+            self.pkg_name = 'py36-salt'
             self.srv_name = 'salt_minion'
             self.conf_dir = '/usr/local/etc/salt'
         # constants for any other OS
@@ -97,13 +99,13 @@ def handle(name, cfg, cloud, log, _args):
     if 'conf' in s_cfg:
         # Add all sections from the conf object to minion config file
         minion_config = os.path.join(const.conf_dir, 'minion')
-        minion_data = util.yaml_dumps(s_cfg.get('conf'))
+        minion_data = safeyaml.dumps(s_cfg.get('conf'))
         util.write_file(minion_config, minion_data)
 
     if 'grains' in s_cfg:
         # add grains to /etc/salt/grains
         grains_config = os.path.join(const.conf_dir, 'grains')
-        grains_data = util.yaml_dumps(s_cfg.get('grains'))
+        grains_data = safeyaml.dumps(s_cfg.get('grains'))
         util.write_file(grains_config, grains_data)
 
     # ... copy the key pair if specified
@@ -123,7 +125,8 @@ def handle(name, cfg, cloud, log, _args):
     # we need to have the salt minion service enabled in rc in order to be
     # able to start the service. this does only apply on FreeBSD servers.
     if cloud.distro.osfamily == 'freebsd':
-        cloud.distro.updatercconf('salt_minion_enable', 'YES')
+        rhel_util.update_sysconfig_file(
+            '/etc/rc.conf', {'salt_minion_enable': 'YES'})
 
     # restart salt-minion. 'service' will start even if not started. if it
     # was started, it needs to be restarted for config change.