diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-11-25 11:54:51 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-11-25 11:54:51 -0800 |
| commit | 26af82a55325c460fdeb7eb6dceef7d433671e47 (patch) | |
| tree | a7b2e972073d2de223b1bef7519f3122bef549d2 /cloudinit/distros | |
| parent | 1db41a6f5283d38dff6de0b0421d51eac869a39c (diff) | |
| parent | 7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e (diff) | |
| download | vyos-cloud-init-26af82a55325c460fdeb7eb6dceef7d433671e47.tar.gz vyos-cloud-init-26af82a55325c460fdeb7eb6dceef7d433671e47.zip | |
Fixes rpm spec file build issues (its not currently building).
Currently the rpm building process that cloud-init provides is
not working correctly. This adjusts the spec file, the setup.py
file and the distro files to ensure that it continues to work
as expected.
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/__init__.py | 1 | ||||
| -rw-r--r-- | cloudinit/distros/rhel.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 83c2eebf..bf465442 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -51,6 +51,7 @@ LOG = logging.getLogger(__name__) class Distro(object): __metaclass__ = abc.ABCMeta + usr_lib_exec = "/usr/lib" hosts_fn = "/etc/hosts" ci_sudoers_fn = "/etc/sudoers.d/90-cloud-init-users" hostname_conf_fn = "/etc/hostname" diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index 13335df5..d5cc15fe 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -50,6 +50,7 @@ class Distro(distros.Distro): network_script_tpl = '/etc/sysconfig/network-scripts/ifcfg-%s' resolve_conf_fn = "/etc/resolv.conf" tz_local_fn = "/etc/localtime" + usr_lib_exec = "/usr/libexec" def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) |