diff options
| -rw-r--r-- | cloudinit/config/__init__.py (renamed from cloudinit/transforms/__init__.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/apt_pipelining.py (renamed from cloudinit/transforms/apt_pipelining.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/apt_update_upgrade.py (renamed from cloudinit/transforms/apt_update_upgrade.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/bootcmd.py (renamed from cloudinit/transforms/bootcmd.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/byobu.py (renamed from cloudinit/transforms/byobu.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/ca_certs.py (renamed from cloudinit/transforms/ca_certs.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/cc_mcollective.py (renamed from cloudinit/transforms/mcollective.py) | 4 | ||||
| -rw-r--r-- | cloudinit/config/cc_puppet.py (renamed from cloudinit/transforms/puppet.py) | 4 | ||||
| -rw-r--r-- | cloudinit/config/chef.py (renamed from cloudinit/transforms/chef.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/disable_ec2_metadata.py (renamed from cloudinit/transforms/disable_ec2_metadata.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/final_message.py (renamed from cloudinit/transforms/final_message.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/foo.py (renamed from cloudinit/transforms/foo.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/grub_dpkg.py (renamed from cloudinit/transforms/grub_dpkg.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/keys_to_console.py (renamed from cloudinit/transforms/keys_to_console.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/landscape.py (renamed from cloudinit/transforms/landscape.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/locale.py (renamed from cloudinit/transforms/locale.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/mounts.py (renamed from cloudinit/transforms/mounts.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/phone_home.py (renamed from cloudinit/transforms/phone_home.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/resizefs.py (renamed from cloudinit/transforms/resizefs.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/rightscale_userdata.py (renamed from cloudinit/transforms/rightscale_userdata.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/rsyslog.py (renamed from cloudinit/transforms/rsyslog.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/runcmd.py (renamed from cloudinit/transforms/runcmd.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/salt_minion.py (renamed from cloudinit/transforms/salt_minion.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/scripts_per_boot.py (renamed from cloudinit/transforms/scripts_per_boot.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/scripts_per_instance.py (renamed from cloudinit/transforms/scripts_per_instance.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/scripts_per_once.py (renamed from cloudinit/transforms/scripts_per_once.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/scripts_user.py (renamed from cloudinit/transforms/scripts_user.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/set_hostname.py (renamed from cloudinit/transforms/set_hostname.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/set_passwords.py (renamed from cloudinit/transforms/set_passwords.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/ssh.py (renamed from cloudinit/transforms/ssh.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/ssh_import_id.py (renamed from cloudinit/transforms/ssh_import_id.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/timezone.py (renamed from cloudinit/transforms/timezone.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/update_etc_hosts.py (renamed from cloudinit/transforms/update_etc_hosts.py) | 0 | ||||
| -rw-r--r-- | cloudinit/config/update_hostname.py (renamed from cloudinit/transforms/update_hostname.py) | 0 |
34 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/transforms/__init__.py b/cloudinit/config/__init__.py index 5cd08575..5cd08575 100644 --- a/cloudinit/transforms/__init__.py +++ b/cloudinit/config/__init__.py diff --git a/cloudinit/transforms/apt_pipelining.py b/cloudinit/config/apt_pipelining.py index f460becb..f460becb 100644 --- a/cloudinit/transforms/apt_pipelining.py +++ b/cloudinit/config/apt_pipelining.py diff --git a/cloudinit/transforms/apt_update_upgrade.py b/cloudinit/config/apt_update_upgrade.py index f5b4b58f..f5b4b58f 100644 --- a/cloudinit/transforms/apt_update_upgrade.py +++ b/cloudinit/config/apt_update_upgrade.py diff --git a/cloudinit/transforms/bootcmd.py b/cloudinit/config/bootcmd.py index 635e3a1f..635e3a1f 100644 --- a/cloudinit/transforms/bootcmd.py +++ b/cloudinit/config/bootcmd.py diff --git a/cloudinit/transforms/byobu.py b/cloudinit/config/byobu.py index 741aa934..741aa934 100644 --- a/cloudinit/transforms/byobu.py +++ b/cloudinit/config/byobu.py diff --git a/cloudinit/transforms/ca_certs.py b/cloudinit/config/ca_certs.py index 56c41561..56c41561 100644 --- a/cloudinit/transforms/ca_certs.py +++ b/cloudinit/config/ca_certs.py diff --git a/cloudinit/transforms/mcollective.py b/cloudinit/config/cc_mcollective.py index 9754d6b8..4cec6494 100644 --- a/cloudinit/transforms/mcollective.py +++ b/cloudinit/config/cc_mcollective.py @@ -21,7 +21,7 @@ from StringIO import StringIO -from cloudinit import cfg as config +from cloudinit import helpers from cloudinit import util PUBCERT_FILE = "/etc/mcollective/ssl/server-public.pem" @@ -44,7 +44,7 @@ def handle(name, cfg, cloud, log, _args): # ... and then update the mcollective configuration if 'conf' in mcollective_cfg: # Create object for reading server.cfg values - mcollective_config = config.DefaultingConfigParser() + mcollective_config = helpers.DefaultingConfigParser() # Read server.cfg values from original file in order to be able to mix # the rest up server_cfg_fn = cloud.paths.join(True, '/etc/mcollective/server.cfg') diff --git a/cloudinit/transforms/puppet.py b/cloudinit/config/cc_puppet.py index d55118ea..5fb88bf2 100644 --- a/cloudinit/transforms/puppet.py +++ b/cloudinit/config/cc_puppet.py @@ -24,7 +24,7 @@ import os import pwd import socket -from cloudinit import cfg as config +from cloudinit import helpers from cloudinit import util @@ -46,7 +46,7 @@ def handle(name, cfg, cloud, log, _args): puppet_conf_fn = cloud.paths.join(False, '/etc/puppet/puppet.conf') contents = util.load_file(puppet_conf_fn) # Create object for reading puppet.conf values - puppet_config = config.DefaultingConfigParser() + puppet_config = helpers.DefaultingConfigParser() # Read puppet.conf values from original file in order to be able to # mix the rest up. First clean them up (TODO is this really needed??) cleaned_lines = [i.lstrip() for i in contents.splitlines()] diff --git a/cloudinit/transforms/chef.py b/cloudinit/config/chef.py index 4e8ef346..4e8ef346 100644 --- a/cloudinit/transforms/chef.py +++ b/cloudinit/config/chef.py diff --git a/cloudinit/transforms/disable_ec2_metadata.py b/cloudinit/config/disable_ec2_metadata.py index c7d26029..c7d26029 100644 --- a/cloudinit/transforms/disable_ec2_metadata.py +++ b/cloudinit/config/disable_ec2_metadata.py diff --git a/cloudinit/transforms/final_message.py b/cloudinit/config/final_message.py index c257b6d0..c257b6d0 100644 --- a/cloudinit/transforms/final_message.py +++ b/cloudinit/config/final_message.py diff --git a/cloudinit/transforms/foo.py b/cloudinit/config/foo.py index 99135704..99135704 100644 --- a/cloudinit/transforms/foo.py +++ b/cloudinit/config/foo.py diff --git a/cloudinit/transforms/grub_dpkg.py b/cloudinit/config/grub_dpkg.py index 02f05ce3..02f05ce3 100644 --- a/cloudinit/transforms/grub_dpkg.py +++ b/cloudinit/config/grub_dpkg.py diff --git a/cloudinit/transforms/keys_to_console.py b/cloudinit/config/keys_to_console.py index 40758198..40758198 100644 --- a/cloudinit/transforms/keys_to_console.py +++ b/cloudinit/config/keys_to_console.py diff --git a/cloudinit/transforms/landscape.py b/cloudinit/config/landscape.py index 29ce41b9..29ce41b9 100644 --- a/cloudinit/transforms/landscape.py +++ b/cloudinit/config/landscape.py diff --git a/cloudinit/transforms/locale.py b/cloudinit/config/locale.py index 7f273123..7f273123 100644 --- a/cloudinit/transforms/locale.py +++ b/cloudinit/config/locale.py diff --git a/cloudinit/transforms/mounts.py b/cloudinit/config/mounts.py index 700fbc44..700fbc44 100644 --- a/cloudinit/transforms/mounts.py +++ b/cloudinit/config/mounts.py diff --git a/cloudinit/transforms/phone_home.py b/cloudinit/config/phone_home.py index a8752527..a8752527 100644 --- a/cloudinit/transforms/phone_home.py +++ b/cloudinit/config/phone_home.py diff --git a/cloudinit/transforms/resizefs.py b/cloudinit/config/resizefs.py index 1690094a..1690094a 100644 --- a/cloudinit/transforms/resizefs.py +++ b/cloudinit/config/resizefs.py diff --git a/cloudinit/transforms/rightscale_userdata.py b/cloudinit/config/rightscale_userdata.py index 8385e281..8385e281 100644 --- a/cloudinit/transforms/rightscale_userdata.py +++ b/cloudinit/config/rightscale_userdata.py diff --git a/cloudinit/transforms/rsyslog.py b/cloudinit/config/rsyslog.py index f2c1de1e..f2c1de1e 100644 --- a/cloudinit/transforms/rsyslog.py +++ b/cloudinit/config/rsyslog.py diff --git a/cloudinit/transforms/runcmd.py b/cloudinit/config/runcmd.py index f121484b..f121484b 100644 --- a/cloudinit/transforms/runcmd.py +++ b/cloudinit/config/runcmd.py diff --git a/cloudinit/transforms/salt_minion.py b/cloudinit/config/salt_minion.py index 16f5286d..16f5286d 100644 --- a/cloudinit/transforms/salt_minion.py +++ b/cloudinit/config/salt_minion.py diff --git a/cloudinit/transforms/scripts_per_boot.py b/cloudinit/config/scripts_per_boot.py index 364e1d02..364e1d02 100644 --- a/cloudinit/transforms/scripts_per_boot.py +++ b/cloudinit/config/scripts_per_boot.py diff --git a/cloudinit/transforms/scripts_per_instance.py b/cloudinit/config/scripts_per_instance.py index d75ab47d..d75ab47d 100644 --- a/cloudinit/transforms/scripts_per_instance.py +++ b/cloudinit/config/scripts_per_instance.py diff --git a/cloudinit/transforms/scripts_per_once.py b/cloudinit/config/scripts_per_once.py index 80f8c325..80f8c325 100644 --- a/cloudinit/transforms/scripts_per_once.py +++ b/cloudinit/config/scripts_per_once.py diff --git a/cloudinit/transforms/scripts_user.py b/cloudinit/config/scripts_user.py index f4fe3a2a..f4fe3a2a 100644 --- a/cloudinit/transforms/scripts_user.py +++ b/cloudinit/config/scripts_user.py diff --git a/cloudinit/transforms/set_hostname.py b/cloudinit/config/set_hostname.py index 3ac8a8fa..3ac8a8fa 100644 --- a/cloudinit/transforms/set_hostname.py +++ b/cloudinit/config/set_hostname.py diff --git a/cloudinit/transforms/set_passwords.py b/cloudinit/config/set_passwords.py index e7049f22..e7049f22 100644 --- a/cloudinit/transforms/set_passwords.py +++ b/cloudinit/config/set_passwords.py diff --git a/cloudinit/transforms/ssh.py b/cloudinit/config/ssh.py index e5e99560..e5e99560 100644 --- a/cloudinit/transforms/ssh.py +++ b/cloudinit/config/ssh.py diff --git a/cloudinit/transforms/ssh_import_id.py b/cloudinit/config/ssh_import_id.py index d57e4665..d57e4665 100644 --- a/cloudinit/transforms/ssh_import_id.py +++ b/cloudinit/config/ssh_import_id.py diff --git a/cloudinit/transforms/timezone.py b/cloudinit/config/timezone.py index 747c436c..747c436c 100644 --- a/cloudinit/transforms/timezone.py +++ b/cloudinit/config/timezone.py diff --git a/cloudinit/transforms/update_etc_hosts.py b/cloudinit/config/update_etc_hosts.py index 75615db1..75615db1 100644 --- a/cloudinit/transforms/update_etc_hosts.py +++ b/cloudinit/config/update_etc_hosts.py diff --git a/cloudinit/transforms/update_hostname.py b/cloudinit/config/update_hostname.py index 58444fab..58444fab 100644 --- a/cloudinit/transforms/update_hostname.py +++ b/cloudinit/config/update_hostname.py |