summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-22 17:00:50 -0400
committerScott Moser <smoser@brickies.net>2016-08-22 17:00:50 -0400
commitc0c45eba28e623751d71a7fa3cb27c87300b851e (patch)
tree67fbb66105b1b81fa92240c59543962d716087e3 /config
parentc13f800d19884a28c57745f692d1b5221c6c3a6c (diff)
parent40a2f621b05c11ed6397a1735b6bfff0ea07b097 (diff)
downloadvyos-cloud-init-c0c45eba28e623751d71a7fa3cb27c87300b851e.tar.gz
vyos-cloud-init-c0c45eba28e623751d71a7fa3cb27c87300b851e.zip
merge from master at 0.7.7-17-g40a2f62
Diffstat (limited to 'config')
-rw-r--r--config/cloud.cfg6
1 files changed, 0 insertions, 6 deletions
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 93ef3423..2d7fb473 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -98,7 +98,6 @@ system_info:
cloud_dir: /var/lib/cloud/
templates_dir: /etc/cloud/templates/
upstart_dir: /etc/init/
- dhclient_lease:
package_mirrors:
- arches: [i386, amd64]
failsafe:
@@ -115,8 +114,3 @@ system_info:
primary: http://ports.ubuntu.com/ubuntu-ports
security: http://ports.ubuntu.com/ubuntu-ports
ssh_svcname: ssh
-datasource:
- Azure:
- set_hostname: False
- agent_command: __builtin__
-