Added arch distro class to merge request
This commit is contained in:
Nate House nathan.house@rackspace.com
commit
f458a78898
@ -139,6 +139,8 @@ def handle(_name, cfg, cloud, log, args):
|
||||
cmd = cloud.distro.init_cmd # Default service
|
||||
cmd.append(cloud.distro.get_option('ssh_svcname', 'ssh'))
|
||||
cmd.append('restart')
|
||||
if 'systemctl' in cmd: # Switch action ordering
|
||||
cmd[1], cmd[2] = cmd[2], cmd[1]
|
||||
cmd = filter(None, cmd) # Remove empty arguments
|
||||
util.subp(cmd)
|
||||
log.debug("Restarted the ssh daemon")
|
||||
|
||||
@ -41,7 +41,8 @@ OSFAMILIES = {
|
||||
'redhat': ['fedora', 'rhel'],
|
||||
'gentoo': ['gentoo'],
|
||||
'freebsd': ['freebsd'],
|
||||
'suse': ['sles']
|
||||
'suse': ['sles'],
|
||||
'arch': ['arch'],
|
||||
}
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
225
cloudinit/distros/arch.py
Normal file
225
cloudinit/distros/arch.py
Normal file
@ -0,0 +1,225 @@
|
||||
# vi: ts=4 expandtab
|
||||
#
|
||||
# Copyright (C) 2014 Rackspace, US Inc.
|
||||
#
|
||||
# Author: Nate House <nathan.house@rackspace.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/>.
|
||||
|
||||
from cloudinit import distros
|
||||
from cloudinit import helpers
|
||||
from cloudinit import log as logging
|
||||
from cloudinit import util
|
||||
|
||||
from cloudinit.distros import net_util
|
||||
from cloudinit.distros.parsers.hostname import HostnameConf
|
||||
|
||||
from cloudinit.settings import PER_INSTANCE
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Distro(distros.Distro):
|
||||
locale_conf_fn = "/etc/locale.gen"
|
||||
network_conf_dir = "/etc/netctl"
|
||||
tz_conf_fn = "/etc/timezone"
|
||||
tz_local_fn = "/etc/localtime"
|
||||
resolv_conf_fn = "/etc/resolv.conf"
|
||||
init_cmd = ['systemctl'] # init scripts
|
||||
exclude_modules = [
|
||||
'grub-dpkg',
|
||||
'apt-configure',
|
||||
'apt-pipelining',
|
||||
'yum-add-repo',
|
||||
]
|
||||
|
||||
def __init__(self, name, cfg, paths):
|
||||
distros.Distro.__init__(self, name, cfg, paths)
|
||||
# This will be used to restrict certain
|
||||
# calls from repeatly happening (when they
|
||||
# should only happen say once per instance...)
|
||||
self._runner = helpers.Runners(paths)
|
||||
self.osfamily = 'arch'
|
||||
cfg['ssh_svcname'] = 'sshd'
|
||||
|
||||
def apply_locale(self, locale, out_fn=None):
|
||||
if not out_fn:
|
||||
out_fn = self.locale_conf_fn
|
||||
util.subp(['locale-gen', '-G', locale], capture=False)
|
||||
# "" provides trailing newline during join
|
||||
lines = [
|
||||
util.make_header(),
|
||||
'LANG="%s"' % (locale),
|
||||
"",
|
||||
]
|
||||
util.write_file(out_fn, "\n".join(lines))
|
||||
|
||||
def install_packages(self, pkglist):
|
||||
self.update_package_sources()
|
||||
self.package_command('', pkgs=pkglist)
|
||||
|
||||
def _write_network(self, settings):
|
||||
entries = net_util.translate_network(settings)
|
||||
LOG.debug("Translated ubuntu style network settings %s into %s",
|
||||
settings, entries)
|
||||
dev_names = entries.keys()
|
||||
# Format for netctl
|
||||
for (dev, info) in entries.iteritems():
|
||||
nameservers = []
|
||||
net_fn = self.network_conf_dir + dev
|
||||
net_cfg = {
|
||||
'Connection': 'ethernet',
|
||||
'Interface': dev,
|
||||
'IP': info.get('bootproto'),
|
||||
'Address': "('%s/%s')" % (info.get('address'),
|
||||
info.get('netmask')),
|
||||
'Gateway': info.get('gateway'),
|
||||
'DNS': str(tuple(info.get('dns-nameservers'))).replace(',', '')
|
||||
}
|
||||
util.write_file(net_fn, convert_netctl(net_cfg))
|
||||
if info.get('auto'):
|
||||
self._enable_interface(dev)
|
||||
if 'dns-nameservers' in info:
|
||||
nameservers.extend(info['dns-nameservers'])
|
||||
|
||||
if nameservers:
|
||||
util.write_file(self.resolve_conf_fn,
|
||||
convert_resolv_conf(nameservers))
|
||||
|
||||
return dev_names
|
||||
|
||||
def _enable_interface(self, device_name):
|
||||
cmd = ['netctl', 'reenable', device_name]
|
||||
try:
|
||||
(_out, err) = util.subp(cmd)
|
||||
if len(err):
|
||||
LOG.warn("Running %s resulted in stderr output: %s", cmd, err)
|
||||
except util.ProcessExecutionError:
|
||||
util.logexc(LOG, "Running interface command %s failed", cmd)
|
||||
|
||||
def _bring_up_interface(self, device_name):
|
||||
cmd = ['netctl', 'restart', device_name]
|
||||
LOG.debug("Attempting to run bring up interface %s using command %s",
|
||||
device_name, cmd)
|
||||
try:
|
||||
(_out, err) = util.subp(cmd)
|
||||
if len(err):
|
||||
LOG.warn("Running %s resulted in stderr output: %s", cmd, err)
|
||||
return True
|
||||
except util.ProcessExecutionError:
|
||||
util.logexc(LOG, "Running interface command %s failed", cmd)
|
||||
return False
|
||||
|
||||
def _bring_up_interfaces(self, device_names):
|
||||
for d in device_names:
|
||||
if not self._bring_up_interface(d):
|
||||
return False
|
||||
return True
|
||||
|
||||
def _select_hostname(self, hostname, fqdn):
|
||||
# Prefer the short hostname over the long
|
||||
# fully qualified domain name
|
||||
if not hostname:
|
||||
return fqdn
|
||||
return hostname
|
||||
|
||||
def _write_hostname(self, your_hostname, out_fn):
|
||||
conf = None
|
||||
try:
|
||||
# Try to update the previous one
|
||||
# so lets see if we can read it first.
|
||||
conf = self._read_hostname_conf(out_fn)
|
||||
except IOError:
|
||||
pass
|
||||
if not conf:
|
||||
conf = HostnameConf('')
|
||||
conf.set_hostname(your_hostname)
|
||||
util.write_file(out_fn, str(conf), 0644)
|
||||
|
||||
def _read_system_hostname(self):
|
||||
sys_hostname = self._read_hostname(self.hostname_conf_fn)
|
||||
return (self.hostname_conf_fn, sys_hostname)
|
||||
|
||||
def _read_hostname_conf(self, filename):
|
||||
conf = HostnameConf(util.load_file(filename))
|
||||
conf.parse()
|
||||
return conf
|
||||
|
||||
def _read_hostname(self, filename, default=None):
|
||||
hostname = None
|
||||
try:
|
||||
conf = self._read_hostname_conf(filename)
|
||||
hostname = conf.hostname
|
||||
except IOError:
|
||||
pass
|
||||
if not hostname:
|
||||
return default
|
||||
return hostname
|
||||
|
||||
def set_timezone(self, tz):
|
||||
tz_file = self._find_tz_file(tz)
|
||||
# Note: "" provides trailing newline during join
|
||||
tz_lines = [
|
||||
util.make_header(),
|
||||
str(tz),
|
||||
"",
|
||||
]
|
||||
util.write_file(self.tz_conf_fn, "\n".join(tz_lines))
|
||||
# This ensures that the correct tz will be used for the system
|
||||
util.copy(tz_file, self.tz_local_fn)
|
||||
|
||||
def package_command(self, command, args=None, pkgs=None):
|
||||
if pkgs is None:
|
||||
pkgs = []
|
||||
|
||||
cmd = ['pacman']
|
||||
# Redirect output
|
||||
cmd.append("-Sy")
|
||||
cmd.append("--quiet")
|
||||
cmd.append("--noconfirm")
|
||||
|
||||
if args and isinstance(args, str):
|
||||
cmd.append(args)
|
||||
elif args and isinstance(args, list):
|
||||
cmd.extend(args)
|
||||
|
||||
if command:
|
||||
cmd.append(command)
|
||||
|
||||
pkglist = util.expand_package_list('%s-%s', pkgs)
|
||||
cmd.extend(pkglist)
|
||||
|
||||
# Allow the output of this to flow outwards (ie not be captured)
|
||||
util.subp(cmd, capture=False)
|
||||
|
||||
def update_package_sources(self):
|
||||
self._runner.run("update-sources", self.package_command,
|
||||
["-y"], freq=PER_INSTANCE)
|
||||
|
||||
|
||||
def convert_netctl(settings):
|
||||
"""Returns a settings string formatted for netctl."""
|
||||
result = ''
|
||||
if isinstance(settings, dict):
|
||||
for k, v in settings.items():
|
||||
result = result + '%s=%s\n' % (k, v)
|
||||
return result
|
||||
|
||||
|
||||
def convert_resolv_conf(settings):
|
||||
"""Returns a settings string formatted for resolv.conf."""
|
||||
result = ''
|
||||
if isinstance(settings, list):
|
||||
for ns in list:
|
||||
result = result + 'nameserver %s\n' % ns
|
||||
return result
|
||||
Loading…
x
Reference in New Issue
Block a user