Revision 28991d59 snf-deploy/fabfile.py

b/snf-deploy/fabfile.py
299 299
    custom = customize_settings_from_tmpl(tmpl, replace)
300 300
    try:
301 301
        put(custom, tmpl)
302
        cmd = """
303
        echo "\
304
# This has been generated automatically by snf-deploy, at
305
# $(date).
306
# The immutable bit (+i attribute) has been used to avoid it being
307
# overwritten by software such as NetworkManager or resolvconf.
308
# Use lsattr/chattr to view or modify its file attributes.
309

  
310

  
311
$(cat {0})" > {0}
312
""".format(tmpl)
313
        try_run(cmd)
302 314
    except:
303 315
        pass
304 316
    try_run("chattr +i /etc/resolv.conf")
......
1241 1253
    debug(env.host, " * Adding public network in cyclades...")
1242 1254
    backend_id = get_backend_id(env.env.cluster.fqdn)
1243 1255
    cmd = """
1244
    snf-manage network-create --subnet={0} --gateway={1} --public --dhcp=True --flavor={2} --mode=bridged --link={3} --name=Internet --backend-id={4}
1256
    snf-manage network-create --subnet={0} --gateway={1} --public \
1257
        --dhcp=True --flavor={2} --mode=bridged --link={3} --name=Internet \
1258
        --backend-id={4}
1245 1259
    """.format(env.env.synnefo_public_network_subnet,
1246 1260
               env.env.synnefo_public_network_gateway,
1247 1261
               env.env.synnefo_public_network_type,

Also available in: Unified diff