Revision fea067c8 snf-deploy/fabfile.py
b/snf-deploy/fabfile.py | ||
---|---|---|
89 | 89 |
return |
90 | 90 |
|
91 | 91 |
info = getattr(env.env, package) |
92 |
if info in ["squeeze-backports", "stable", "testing", "unstable", "wheezy"]: |
|
92 |
if info in ["squeeze-backports", "squeeze", "stable", "testing", "unstable", "wheezy"]:
|
|
93 | 93 |
APT_GET += " -t %s %s " % (info, package) |
94 | 94 |
elif info: |
95 | 95 |
APT_GET += " %s=%s " % (package, info) |
... | ... | |
283 | 283 |
def setup_hosts(): |
284 | 284 |
debug(env.host, "Tweaking /etc/hosts and ssh_config files...") |
285 | 285 |
try_run("echo StrictHostKeyChecking no >> /etc/ssh/ssh_config") |
286 |
cmd = " sed -i 's/^127.*/127.0.0.1 localhost/' /etc/hosts "
|
|
286 |
cmd = "sed -i 's/^127.*$/127.0.0.1 localhost/g' /etc/hosts "
|
|
287 | 287 |
try_run(cmd) |
288 | 288 |
host_info = env.env.ips_info[env.host] |
289 | 289 |
cmd = "hostname %s" % host_info.hostname |
... | ... | |
528 | 528 |
|
529 | 529 |
|
530 | 530 |
@roles("accounts") |
531 |
def astakos_register_services():
|
|
531 |
def astakos_register_components():
|
|
532 | 532 |
debug(env.host, " * Register services in astakos...") |
533 | 533 |
|
534 | 534 |
cyclades_base_url = "https://%s/cyclades/" % env.env.cyclades.fqdn |
... | ... | |
1194 | 1194 |
debug(env.host, " * Adding public network in cyclades...") |
1195 | 1195 |
backend_id = get_backend_id(env.env.cluster.fqdn) |
1196 | 1196 |
cmd = """ |
1197 |
snf-manage network-create --subnet={0} --gateway={1} --public --dhcp --flavor={2} --mode=bridged --link={3} --name=Internet --backend-id={4} |
|
1197 |
snf-manage network-create --subnet={0} --gateway={1} --public --dhcp=True --flavor={2} --mode=bridged --link={3} --name=Internet --backend-id={4}
|
|
1198 | 1198 |
""".format(env.env.synnefo_public_network_subnet, |
1199 | 1199 |
env.env.synnefo_public_network_gateway, |
1200 | 1200 |
env.env.synnefo_public_network_type, |
... | ... | |
1243 | 1243 |
@roles("client") |
1244 | 1244 |
def register_image(image="debian_base.diskdump"): |
1245 | 1245 |
debug(env.host, " * Register image to plankton...") |
1246 |
with settings(host_string=env.env.db.ip): |
|
1247 |
uid, user_auth_token, user_uuid = get_auth_token_from_db(env.env.user_email) |
|
1246 |
# with settings(host_string=env.env.db.ip):
|
|
1247 |
# uid, user_auth_token, user_uuid = get_auth_token_from_db(env.env.user_email)
|
|
1248 | 1248 |
|
1249 | 1249 |
image_location = "images:{0}".format(image) |
1250 | 1250 |
cmd = """ |
Also available in: Unified diff