Revision eaaeb53c
| b/ci/utils.py | ||
|---|---|---|
| 829 | 829 |
cmd = """ |
| 830 | 830 |
dpkg -i snf-deploy*.deb |
| 831 | 831 |
apt-get -f install --yes --force-yes |
| 832 |
snf-deploy keygen |
|
| 832 | 833 |
""" |
| 833 | 834 |
with fabric.cd("synnefo_build-area"):
|
| 834 | 835 |
with fabric.settings(warn_only=True): |
| ... | ... | |
| 904 | 905 |
|
| 905 | 906 |
self.logger.debug("Run snf-deploy")
|
| 906 | 907 |
cmd = """ |
| 907 |
snf-deploy keygen --force |
|
| 908 | 908 |
snf-deploy --disable-colors --autoconf all |
| 909 | 909 |
""" |
| 910 | 910 |
_run(cmd, True) |
| b/snf-deploy/snfdeploy/__init__.py | ||
|---|---|---|
| 572 | 572 |
|
| 573 | 573 |
# Check if there are keys to use |
| 574 | 574 |
if args.command == "keygen": |
| 575 |
if not args.force: |
|
| 576 |
if not must_create_keys(env) or not must_create_ddns_keys(env): |
|
| 577 |
print "Keys already exist.." |
|
| 578 |
print "To override existing ones use --force." |
|
| 579 |
return 1 |
|
| 580 |
do_create_keys(args, env) |
|
| 581 |
do_create_ddns_keys(args, env) |
|
| 575 |
if must_create_keys(env) or args.force: |
|
| 576 |
do_create_keys(args, env) |
|
| 577 |
else: |
|
| 578 |
print "ssh keys found. To re-create them use --force" |
|
| 579 |
if must_create_ddns_keys(env) or args.force: |
|
| 580 |
do_create_ddns_keys(args, env) |
|
| 581 |
else: |
|
| 582 |
print "ddns keys found. To re-create them use --force" |
|
| 582 | 583 |
return 0 |
| 583 | 584 |
else: |
| 584 | 585 |
if ((args.key_inject and not args.ssh_key and |
Also available in: Unified diff