3a2a527531
This change adds the ability to provide specific package versions to
Distro.install_packages and subsequently Distro.package_command. In order
to effectively use Distro.install_packages, one is now able to pass a
variety of formats in order to easily manage package requirements. These
are examples of what can be passed:
- "package"
- ["package1","package2"]
- ("package",)
- ("package", "version")
- [("package1",)("package2",)]
- [("package1", "version1"),("package2","version2")]
This change also adds the option to install a specific version for the
puppet configuration module. This is especially important here as
successful puppet deployments are highly reliant on specific puppet
versions.
60 lines
2.3 KiB
Python
60 lines
2.3 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 = 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 = 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)
|