diff options
author | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
---|---|---|
committer | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
commit | 6056acfa06c2b79ee8981b9f36a1ced2dac29111 (patch) | |
tree | 613944f1de089105950a86501507b6aa2151380d /tools/cloud-init/openstack/90_dpkg.cfg | |
parent | b229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff) | |
parent | 8c22ceead487b745d6b7c058c4d1c0a0eaa051c8 (diff) | |
download | vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.tar.gz vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.zip |
Merge remote-tracking branch 'origin/current' into equuleus
fixed merge errors in:
* scripts/live-build-config
- kernel parameters
* scripts/build-packages
- fixed list of packages to compile
Diffstat (limited to 'tools/cloud-init/openstack/90_dpkg.cfg')
-rw-r--r-- | tools/cloud-init/openstack/90_dpkg.cfg | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/cloud-init/openstack/90_dpkg.cfg b/tools/cloud-init/openstack/90_dpkg.cfg new file mode 100644 index 00000000..a740b314 --- /dev/null +++ b/tools/cloud-init/openstack/90_dpkg.cfg @@ -0,0 +1,8 @@ +# to update this file, run dpkg-reconfigure cloud-init +datasource_list: [ NoCloud, ConfigDrive, OpenNebula, DigitalOcean, AltCloud, MAAS, OpenStack, CloudSigma, SmartOS, None ] +disable_ec2_metadata: true +datasource: + OpenStack: + max_wait: 6 + timeout: 3 + retries: 2 |