summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-12-02 12:23:23 -0500
committerScott Moser <smoser@brickies.net>2017-01-20 10:42:20 -0500
commit7b7c3b87230bb3931757946825c0a62a2523123a (patch)
tree4643e3a3f77fd4676851aad65a5c160a9ee693e3 /debian
parent350a8bd11e775f40756ff4380d0f9dd587d43fcb (diff)
downloadvyos-cloud-init-7b7c3b87230bb3931757946825c0a62a2523123a.tar.gz
vyos-cloud-init-7b7c3b87230bb3931757946825c0a62a2523123a.zip
Azure: still use walinux-agent integration.
Upstream now uses the built-in support for instance initialization on Azure. On a stable release, we want to continue to use the walinux-agent integration. Upstream made this change under bug 1538522.
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/azure-use-walinux-agent.patch17
-rw-r--r--debian/patches/series1
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/azure-use-walinux-agent.patch b/debian/patches/azure-use-walinux-agent.patch
new file mode 100644
index 00000000..d0051b8c
--- /dev/null
+++ b/debian/patches/azure-use-walinux-agent.patch
@@ -0,0 +1,17 @@
+Description: Use walinux-agent rather than builtin fabric support
+ Upstream now uses the built-in support for instance initialization on Azure.
+ On a stable release, we want to continue to use the walinux-agent integration.
+ Upstream made this change under bug 1538522.
+Forwarded: not-needed
+Author: Scott Moser <smoser@ubuntu.com>
+--- a/cloudinit/sources/DataSourceAzure.py
++++ b/cloudinit/sources/DataSourceAzure.py
+@@ -34,7 +34,7 @@ BOUNCE_COMMAND = [
+ RESOURCE_DISK_PATH = '/dev/disk/cloud/azure_resource'
+
+ BUILTIN_DS_CONFIG = {
+- 'agent_command': AGENT_START_BUILTIN,
++ 'agent_command': AGENT_START,
+ 'data_dir': "/var/lib/waagent",
+ 'set_hostname': True,
+ 'hostname_bounce': {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..8804449a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+azure-use-walinux-agent.patch