appscale-tools 1.6.1 → 1.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. data/lib/appscale_tools.rb +13 -3
  2. metadata +3 -3
@@ -185,8 +185,13 @@ module AppScaleTools
185
185
  pub_key, backup_key = CommonFunctions.generate_rsa_key(keyname)
186
186
 
187
187
  if auto
188
- print "\nEnter SSH password of root: "
189
- password = CommonFunctions.get_line_from_stdin_no_echo()
188
+ if options["root_password"].nil?
189
+ print "\nEnter SSH password of root: "
190
+ password = CommonFunctions.get_line_from_stdin_no_echo()
191
+ else
192
+ puts "Using the provided root password to login to AppScale machines"
193
+ password = options["root_password"]
194
+ end
190
195
 
191
196
  # Location of expect script that interacts with ssh-copy-id
192
197
  expect_script = File.join(File.join(File.dirname(__FILE__), "..", "lib"),"sshcopyid")
@@ -298,7 +303,12 @@ module AppScaleTools
298
303
  CommonFunctions.update_locations_file(options['keyname'], [head_node_ip])
299
304
  CommonFunctions.verbose("Run instances: UserAppServer is at #{userappserver_ip}", options['verbose'])
300
305
  uac = UserAppClient.new(userappserver_ip, secret_key)
301
- user, pass = CommonFunctions.get_credentials(options['test'])
306
+ if options["admin_user"].nil? and options["admin_pass"].nil?
307
+ user, pass = CommonFunctions.get_credentials(options['test'])
308
+ else
309
+ puts "Using the provided admin username and password"
310
+ user, pass = options["admin_user"], options["admin_pass"]
311
+ end
302
312
  CommonFunctions.create_user(user, options['test'], head_node_ip,
303
313
  secret_key, uac, pass)
304
314
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: appscale-tools
3
3
  version: !ruby/object:Gem::Version
4
- hash: 13
4
+ hash: 11
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 6
9
- - 1
10
- version: 1.6.1
9
+ - 2
10
+ version: 1.6.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Chris Bunch