f599e720c7
Packages on debian/ubuntu should start on installation. As a result, if we want to get config changes we've inserted to be read, we need to restart. Note one interesting thing here. upstart considers 'restart' as "restart only if currently running", while 'service' considers restart to be "stop if running, then start". So the use of 'service' here is important, rather than just 'restart'
62 lines
2.4 KiB
Python
62 lines
2.4 KiB
Python
# vi: ts=4 expandtab
|
|
#
|
|
# Author: Jeff Bauer <jbauer@rubic.com>
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License version 3, as
|
|
# published by the Free Software Foundation.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import os
|
|
|
|
from cloudinit import util
|
|
|
|
# Note: see http://saltstack.org/topics/installation/
|
|
|
|
|
|
def handle(name, cfg, cloud, log, _args):
|
|
# If there isn't a salt key in the configuration don't do anything
|
|
if 'salt_minion' not in cfg:
|
|
log.debug(("Skipping module named %s,"
|
|
" no 'salt_minion' key in configuration"), name)
|
|
return
|
|
|
|
salt_cfg = cfg['salt_minion']
|
|
|
|
# Start by installing the salt package ...
|
|
cloud.distro.install_packages(["salt-minion"])
|
|
|
|
# Ensure we can configure files at the right dir
|
|
config_dir = cloud.paths.join(False, salt_cfg.get("config_dir",
|
|
'/etc/salt'))
|
|
util.ensure_dir(config_dir)
|
|
|
|
# ... and then update the salt configuration
|
|
if 'conf' in salt_cfg:
|
|
# Add all sections from the conf object to /etc/salt/minion
|
|
minion_config = os.path.join(config_dir, 'minion')
|
|
minion_data = util.yaml_dumps(salt_cfg.get('conf'))
|
|
util.write_file(minion_config, minion_data)
|
|
|
|
# ... copy the key pair if specified
|
|
if 'public_key' in salt_cfg and 'private_key' in salt_cfg:
|
|
pki_dir = cloud.paths.join(False, salt_cfg.get('pki_dir',
|
|
'/etc/salt/pki'))
|
|
with util.umask(077):
|
|
util.ensure_dir(pki_dir)
|
|
pub_name = os.path.join(pki_dir, 'minion.pub')
|
|
pem_name = os.path.join(pki_dir, 'minion.pem')
|
|
util.write_file(pub_name, salt_cfg['public_key'])
|
|
util.write_file(pem_name, salt_cfg['private_key'])
|
|
|
|
# restart salt-minion. 'service' will start even if not started. if it
|
|
# was started, it needs to be restarted for config change.
|
|
util.subp(['service', 'salt-minion', 'restart'], capture=False)
|