From e05e747a7293f991843ca4b7ba5e0736cb5f043f Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Tue, 25 Jun 2013 08:51:21 +0200 Subject: Add a SLES distro handler --- cloudinit/config/cc_resolv_conf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cloudinit/config') diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py index 8a460f7e..d4fead12 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py @@ -1,8 +1,12 @@ # vi: ts=4 expandtab # # Copyright (C) 2013 Craig Tracey +# Copyright (C) 2013 SUSE LLC +# Copyright (C) 2013 Hewlett-Packard Development Company, L.P. # # Author: Craig Tracey +# Author: Robert Schweikert +# Author: Juerg Haefliger # # 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 @@ -53,7 +57,7 @@ from cloudinit import util frequency = PER_INSTANCE -distros = ['fedora', 'rhel'] +distros = ['fedora', 'rhel', 'sles'] def generate_resolv_conf(cloud, log, params): -- cgit v1.2.3 From 467d45906c4575c1d231af268c47e812356657b8 Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Thu, 27 Jun 2013 13:50:33 +0200 Subject: Remove 'Copyright SUSE' from the headers Per discussion with Robert @ SUSE since he can't sign the CCA. --- cloudinit/config/cc_resolv_conf.py | 2 -- cloudinit/distros/__init__.py | 2 -- cloudinit/distros/rhel.py | 2 -- cloudinit/distros/rhel_util.py | 2 -- cloudinit/distros/sles.py | 2 -- 5 files changed, 10 deletions(-) (limited to 'cloudinit/config') diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py index d4fead12..879b62b1 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py @@ -1,11 +1,9 @@ # vi: ts=4 expandtab # # Copyright (C) 2013 Craig Tracey -# Copyright (C) 2013 SUSE LLC # Copyright (C) 2013 Hewlett-Packard Development Company, L.P. # # Author: Craig Tracey -# Author: Robert Schweikert # Author: Juerg Haefliger # # This program is free software: you can redistribute it and/or modify diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index f8727fc1..cda2c6af 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -3,13 +3,11 @@ # Copyright (C) 2012 Canonical Ltd. # Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P. # Copyright (C) 2012 Yahoo! Inc. -# Copyright (C) 2013 SUSE LLC # # Author: Scott Moser # Author: Juerg Haefliger # Author: Joshua Harlow # Author: Ben Howard -# Author: Robert Schweikert # # 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 diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index 4fd4239c..a022ca60 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -3,12 +3,10 @@ # Copyright (C) 2012 Canonical Ltd. # Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P. # Copyright (C) 2012 Yahoo! Inc. -# Copyright (C) 2013 SUSE LLC # # Author: Scott Moser # Author: Juerg Haefliger # Author: Joshua Harlow -# Author: Robert Schweikert # # 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 diff --git a/cloudinit/distros/rhel_util.py b/cloudinit/distros/rhel_util.py index 504b5d2c..1aba58b8 100644 --- a/cloudinit/distros/rhel_util.py +++ b/cloudinit/distros/rhel_util.py @@ -3,12 +3,10 @@ # Copyright (C) 2012 Canonical Ltd. # Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P. # Copyright (C) 2012 Yahoo! Inc. -# Copyright (C) 2013 SUSE LLC # # Author: Scott Moser # Author: Juerg Haefliger # Author: Joshua Harlow -# Author: Robert Schweikert # # 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 diff --git a/cloudinit/distros/sles.py b/cloudinit/distros/sles.py index 95bc411a..d0c15feb 100644 --- a/cloudinit/distros/sles.py +++ b/cloudinit/distros/sles.py @@ -1,9 +1,7 @@ # vi: ts=4 expandtab # -# Copyright (C) 2013 SUSE LLC # Copyright (C) 2013 Hewlett-Packard Development Company, L.P. # -# Author: Robert Schweikert # Author: Juerg Haefliger # # Leaning very heavily on the RHEL and Debian implementation -- cgit v1.2.3