Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

New clusterlauncher.conf path and AMI id update

  • Loading branch information...
commit 427a2b2265e3d30e1a4fd6e9cd7ee5e2ca3c08ac 1 parent 98bb82a
Joaquin Casares authored
View
2  README.md
@@ -19,7 +19,7 @@ Make sure `python-setuptools` and `python-pip` are installed, then run:
## Setup
-Start the program once to copy the default `/etc/cassandralauncher/clusterlauncher.conf` to `~/.clusterlauncher.conf`.
+Start the program once to copy the default `/usr/local/etc/cassandralauncher/clusterlauncher.conf` to `~/.clusterlauncher.conf`.
Exit the program and edit `~/.clusterlauncher.conf` with your appropriate authentication parameters.
View
5 cassandralauncher/cassandralauncher.py
@@ -101,6 +101,8 @@ def install_datastax_ssh(user):
datastax_ssh = os.path.join(os.path.dirname(__file__), 'datastax_ssh')
if not os.path.exists(datastax_ssh):
datastax_ssh = os.path.join('/etc', 'cassandralauncher', 'datastax_ssh')
+ if not os.path.exists(datastax_ssh):
+ datastax_ssh = os.path.join('/usr', 'local', 'etc', 'cassandralauncher', 'datastax_ssh')
# Write the public IPs to the nodelist file
with tempfile.NamedTemporaryFile() as tmp_file:
@@ -160,6 +162,9 @@ def setup_s3_store_and_restore(user):
if not os.path.exists(s3cfg_default):
# Look for the configuration file in /etc/clusterlauncher
s3cfg_default = os.path.join('/etc', 'cassandralauncher', 's3cfg')
+ if not os.path.exists(s3cfg_default):
+ # Look for the configuration file in /usr/local/etc/clusterlauncher
+ s3cfg_default = os.path.join('/usr', 'local', 'etc', 'cassandralauncher', 's3cfg')
with open(s3cfg_default) as f:
s3cfg = f.read()
View
6 cassandralauncher/clusterlauncher.conf
@@ -93,7 +93,11 @@ cfsreplicationfactor =
# demo: Set to 'True' if you are planning on running the demoservice to kill clusters after a set time.
# demotime: Set to the time (in hours) for a cluster to live before being terminated if you wish not to be prompted each time. Cluster dies 3 minutes before hour mark to avoid additional AWS charges.
-datastax_ami = ami-814ec2e8
+datastax_ami = ami-05caca6c
+
+# DataStax HVM AMI
+# datastax_ami = ami-1dcaca74
+
demo = False
demotime =
View
4 cassandralauncher/common.py
@@ -29,6 +29,9 @@ def header():
if not os.path.exists(configfile):
# Look for the configuration file in /etc/clusterlauncher
defaultfile = os.path.join('/etc', 'cassandralauncher', 'clusterlauncher.conf')
+ if not os.path.exists(configfile):
+ # Look for the configuration file in /usr/local/etc/clusterlauncher
+ defaultfile = os.path.join('/usr', 'local', 'etc', 'cassandralauncher', 'clusterlauncher.conf')
configfile = os.path.join(os.path.expanduser('~'), '.clusterlauncher.conf')
shutil.copyfile(defaultfile, configfile)
@@ -48,6 +51,7 @@ def header():
sys.stderr.write(" {0}\n".format(os.path.join(os.path.dirname(__file__), 'clusterlauncher.conf')))
sys.stderr.write(" {0}\n".format(os.path.join(os.path.expanduser('~'), '.clusterlauncher.conf')))
sys.stderr.write(" {0}\n".format(os.path.join('/etc', 'cassandralauncher', 'clusterlauncher.conf')))
+ sys.stderr.write(" {0}\n".format(os.path.join('/usr', 'local', 'etc', 'cassandralauncher', 'clusterlauncher.conf')))
sys.exit(1)
# Read configuration file
View
2  setup.py
@@ -29,7 +29,7 @@
packages=['cassandralauncher'],
scripts=['scripts/cassandralauncher', 'scripts/imagelauncher'],
package_data={'': ['README.md']},
- data_files=[('/etc/cassandralauncher', [
+ data_files=[('/usr/local/etc/cassandralauncher', [
'cassandralauncher/clusterlauncher.conf',
'cassandralauncher/datastax_s3_store',
'cassandralauncher/datastax_s3_restore',

0 comments on commit 427a2b2

Please sign in to comment.
Something went wrong with that request. Please try again.