diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-07-11 17:31:05 -0400 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2013-07-11 21:43:16 +0000 |
| commit | 474773864dfda468f9e344ecdd0d5abdcdefb60d (patch) | |
| tree | 6c2e9ec7c6950929b65f82897b199953b8981a9d /debian/patches/config_for_cloud-init.patch | |
| parent | ec11b39b409497fbe12c51d89938f8e928a4becc (diff) | |
| parent | 696344edbc4808f57254af3f890896501af5db6b (diff) | |
| download | vyos-walinuxagent-474773864dfda468f9e344ecdd0d5abdcdefb60d.tar.gz vyos-walinuxagent-474773864dfda468f9e344ecdd0d5abdcdefb60d.zip | |
Import patches-applied version 1.3.2-0ubuntu3 to applied/ubuntu/saucy-proposed
Imported using git-ubuntu import.
Changelog parent: ec11b39b409497fbe12c51d89938f8e928a4becc
Unapplied parent: 696344edbc4808f57254af3f890896501af5db6b
New changelog entries:
[ Ben Howard ]
* debian/patches/config_for_cloud-init.patch:
Modified configuration to disable provisioning functions.
walinuxagent for Ubuntu should now be used with Cloud-init.
* debian/postinst: Don't overwrite existing /etc/waagent.conf agent
configuration on install or upgrade.
* debian/upstart: start later in boot, avoiding race conditions
with cloud-init.
[ Scott Moser ]
* debian: wrap and sort directory
* debian/patches/no_udev_rule_removal.patch: remove 000 prefix in file
name. No need for numbering in filenames when we have patches/series.
Diffstat (limited to 'debian/patches/config_for_cloud-init.patch')
| -rw-r--r-- | debian/patches/config_for_cloud-init.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches/config_for_cloud-init.patch b/debian/patches/config_for_cloud-init.patch new file mode 100644 index 0000000..19fddad --- /dev/null +++ b/debian/patches/config_for_cloud-init.patch @@ -0,0 +1,36 @@ +Description: Disable provisioning components in config + This disables the provisioning components of walinux-agent. + Cloud-init in newest versions can provide these same services. +Author: Ben Howard +Last-Update: 2013-07-11 +--- a/waagent ++++ b/waagent +@@ -2222,6 +2222,7 @@ exit 0 + WaagentConf = """\ + # + # Windows Azure Linux Agent Configuration ++# This configuration is modified to work with Cloud-init + # + + Role.StateConsumer=None # Specified program is invoked with "Ready" or "Shutdown". +@@ -2230,15 +2231,15 @@ Role.StateConsumer=None + Role.ConfigurationConsumer=None # Specified program is invoked with XML file argument specifying role configuration. + Role.TopologyConsumer=None # Specified program is invoked with XML file argument specifying role topology. + +-Provisioning.Enabled=y # +-Provisioning.DeleteRootPassword=y # Password authentication for root account will be unavailable. +-Provisioning.RegenerateSshHostKeyPair=y # Generate fresh host key pair. ++Provisioning.Enabled=n # ++Provisioning.DeleteRootPassword=n # Password authentication for root account will be unavailable. ++Provisioning.RegenerateSshHostKeyPair=n # Generate fresh host key pair. + Provisioning.SshHostKeyPairType=rsa # Supported values are "rsa", "dsa" and "ecdsa". +-Provisioning.MonitorHostName=y # Monitor host name changes and publish changes via DHCP requests. ++Provisioning.MonitorHostName=n # Monitor host name changes and publish changes via DHCP requests. + + ResourceDisk.Format=y # Format if unformatted. If 'n', resource disk will not be mounted. + ResourceDisk.Filesystem=ext4 # +-ResourceDisk.MountPoint=/mnt/resource # ++ResourceDisk.MountPoint=/mnt # + ResourceDisk.EnableSwap=n # Create and use swapfile on resource disk. + ResourceDisk.SwapSizeMB=0 # Size of the swapfile. + |