Differential D967

Look for the jinja template in the conf/ dir first
ClosedPublic
Actions

Authored by mkrizek on Aug 11 2016, 8:57 AM.

Details

Reviewers
lbrabec
tflink
Group Reviewers
testcloud
Commits
rTCLOUD72b6a6dae7b4: Look for the jinja template in the conf/ dir first
Summary

This way there is no need to copy the jinja template into /var/lib/testcloud when running testcloud from git.

Test Plan

Try creating instance without having the jinja template in /var/lib/testcloud. Worked in my testing.

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped
mkrizek retitled this revision from to Look for the jinja template in the conf/ dir first.Aug 11 2016, 8:57 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added a reviewer: testcloud.
mkrizek set the repository for this revision to rTCLOUD testcloud.
mkrizek added a project: testcloud.
This revision is now accepted and ready to land.Aug 11 2016, 9:05 AM
tflink accepted this revision.Aug 11 2016, 9:23 AM
tflink added a reviewer: tflink.
mkrizek closed this revision.Aug 11 2016, 10:57 AM

Revision Contents

Diff 2468

View Options

testcloud/config.py

Context not available.
4import testcloud 4​import testcloud
5 5​
6 6​
7CONF_DIRS = [os.path.abspath(os.path.dirname(testcloud.__file__)) + '/../conf', 7​DEFAULT_CONF_DIR = os.path.abspath(os.path.dirname(testcloud.__file__)) + '/../conf'
8​
9​CONF_DIRS = [DEFAULT_CONF_DIR,
8 '{}/.config/testcloud'.format(os.environ['HOME']), 10​ '{}/.config/testcloud'.format(os.environ['HOME']),
9 '/etc/testcloud' 11​ '/etc/testcloud'
10 ] 12​ ]
Context not available.
91 STORE_DIR = "/var/lib/testcloud/backingstores" 93​ STORE_DIR = "/var/lib/testcloud/backingstores"
92 94​
93 # libvirt domain XML Template 95​ # libvirt domain XML Template
94 # This lives in the DATA_DIR 96​ # This lives either in the DEFAULT_CONF_DIR or DATA_DIR
95 XML_TEMPLATE = "domain-template.jinja" 97​ XML_TEMPLATE = "domain-template.jinja"
96 98​
97 # Data for cloud-init 99​ # Data for cloud-init
Context not available.
View Options

testcloud/instance.py

Context not available.
311 """ 311​ """
312 312​
313 # Set up the jinja environment 313​ # Set up the jinja environment
314 jinjaLoader = jinja2.FileSystemLoader(searchpath=config_data.DATA_DIR) 314​ jinjaLoader = jinja2.FileSystemLoader(searchpath=[config.DEFAULT_CONF_DIR,
315​ config_data.DATA_DIR])
315 jinjaEnv = jinja2.Environment(loader=jinjaLoader) 316​ jinjaEnv = jinja2.Environment(loader=jinjaLoader)
316 xml_template = jinjaEnv.get_template(config_data.XML_TEMPLATE) 317​ xml_template = jinjaEnv.get_template(config_data.XML_TEMPLATE)
317 318​
Context not available.