Revision 3bae85da snf-deploy/snfdeploy/fabfile.py

b/snf-deploy/snfdeploy/fabfile.py
18 18
from snfdeploy import massedit
19 19

  
20 20

  
21
def setup_env(confdir="conf", packages="packages", templates="files",
22
              cluster_name="ganeti1", autoconf=False, disable_colors=False,
23
              key_inject=False):
21
def setup_env(args):
24 22
    """Setup environment"""
25 23
    print("Loading configuration for synnefo...")
26
    print(" * Using config files under %s..." % confdir)
27
    print(" * Using %s and %s for packages and templates accordingly..."
28
          % (packages, templates))
29

  
30
    autoconf = ast.literal_eval(autoconf)
31
    disable_colors = ast.literal_eval(disable_colors)
32
    env.key_inject = ast.literal_eval(key_inject)
33
    conf = Conf.configure(confdir=confdir, cluster_name=cluster_name,
34
                          autoconf=autoconf)
24

  
25
    conf = Conf(args)
35 26
    env.env = Env(conf)
36 27

  
37
    env.local = autoconf
28
    env.local = args.autoconf
29
    env.key_inject = args.key_inject
38 30
    env.password = env.env.password
39 31
    env.user = env.env.user
40 32
    env.shell = "/bin/bash -c"
33
    env.key_filename = args.ssh_key
41 34

  
42
    if disable_colors:
35
    if args.disable_colors:
43 36
        disable_color()
44 37

  
45 38
    if env.env.cms.hostname in \

Also available in: Unified diff