Permalink
Browse files

nimbus-configure won't ask for hostname everytime

  • Loading branch information...
1 parent 87a9696 commit ad38439a91f4200ba02bae9ae7eb8f583dbaa61f @labisso labisso committed with timf Jun 1, 2010
Showing with 7 additions and 2 deletions.
  1. +7 −2 home/sbin/nimbusconfigure.py
@@ -425,8 +425,13 @@ def perform_setup(self):
pathutil.ensure_file_exists(ca_cert, "CA certificate")
pathutil.ensure_file_exists(ca_key, "CA private key")
- hostname = self.ask_hostname()
- self['hostname'] = hostname
+ if self['hostname']:
+ hostname = self['hostname']
+ log.debug('Using configured hostname: "%s". Run with %s to change.',
+ hostname, ARGS.HOSTNAME_LONG)
+ else:
+ hostname = self.ask_hostname()
+ self['hostname'] = hostname
#TODO the hostcert/key creation should be extracted from here
# right now it just does a bunch of redundant checks first

0 comments on commit ad38439

Please sign in to comment.