summaryrefslogtreecommitdiff
path: root/cloudinit/settings.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-03-03 02:26:38 -0500
committerScott Moser <smoser@brickies.net>2017-03-03 02:26:38 -0500
commitd7004bcf269fe60e456de336ecda9a9d2fe50bfd (patch)
treecf49b1fbc06388d46fa435814d24d97c83476047 /cloudinit/settings.py
parent1de8720effd029727bb5ef7972e7e4d859a1b53a (diff)
parentc81ea53bbdc4ada9d2b52430e106aeb3c38b4e0a (diff)
downloadvyos-cloud-init-d7004bcf269fe60e456de336ecda9a9d2fe50bfd.tar.gz
vyos-cloud-init-d7004bcf269fe60e456de336ecda9a9d2fe50bfd.zip
merge from master at 0.7.9-47-gc81ea53
Diffstat (limited to 'cloudinit/settings.py')
-rw-r--r--cloudinit/settings.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
index b1fdd31f..692ff5e5 100644
--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
@@ -14,6 +14,8 @@ CFG_ENV_NAME = "CLOUD_CFG"
# This is expected to be a yaml formatted file
CLOUD_CONFIG = '/etc/cloud/cloud.cfg'
+RUN_CLOUD_CONFIG = '/run/cloud-init/cloud.cfg'
+
# What u get if no config is provided
CFG_BUILTIN = {
'datasource_list': [