Allow either file-based or command-line AWS credentials - #145

Open

nyetsche wants to merge 7 commits into

Teevity:masterfrom

nyetsche:master

Commits on Feb 4, 2015

Change the System.getProperty calls to those reading from the configuration file ($ICE_HOME/ice.properties). In our environment, we want those credentials in the ice.properties files, plus it lets …
Lesko, Matthew (NIH/NLM/NCBI) [C]
committed
e6eb58f

Commits on Feb 12, 2015

rewrite the code to allow both command-line (System.getProperties) & ICE_HOME definitions for the AWS credentials, first preference is given to those on the command line.
Lesko, Matthew (NIH/NLM/NCBI) [C]
committed
8e066ea
fix typos (System, not system), and change to AND not OR when checking if properties are set or not
Lesko, Matthew (NIH/NLM/NCBI) [C]
committed
bca2a5b
document AWS credentials change - ice.properties or command line works
Lesko, Matthew (NIH/NLM/NCBI) [C]
committed
3589a2c

Commits on Feb 26, 2015

comment out reservationService.init() - a new reservaration type has been added which causes the startup to fail with a NullPointerException. in our environment we do not need the reservation info
Lesko, Matthew (NIH/NLM/NCBI) [C]
committed
7f679c1
Add new South America AZ(sa-east-1c) and some extra debugging so that we get more than an ugly NullPointer exception

ansoni
authored and
Lesko, Matthew (NIH/NLM/NCBI) [C]
committed
73b1b55
Upstream fixed
Lesko, Matthew (NIH/NLM/NCBI) [C]
committed
55b2539