Commit ac4d67ee by Czémán Arnold

Merge branch 'new-option-to-installer' into 'master'

Add development options to install

See merge request !14
parents 26b7ba4b ce0c762a
...@@ -19,4 +19,4 @@ if [ $retv -eq 0 ]; then ...@@ -19,4 +19,4 @@ if [ $retv -eq 0 ]; then
EXTRAPARAMS="--kvm-present" EXTRAPARAMS="--kvm-present"
fi fi
python $PREFIX/install.py $EXTRAPARAMS python $PREFIX/install.py $EXTRAPARAMS $@
...@@ -112,12 +112,20 @@ class KeyStore: ...@@ -112,12 +112,20 @@ class KeyStore:
with open(self.keyfile, 'w') as f: with open(self.keyfile, 'w') as f:
yaml.dump(self.data, f) yaml.dump(self.data, f)
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--kvm-present', action='store_true', parser.add_argument('--kvm-present', action='store_true',
help='Installs with KVM hypervisor otherwise with QEMU.') help='Installs with KVM hypervisor otherwise with QEMU.')
parser.add_argument('--dev', action='store_true',
help='Installs Develpment version')
parser.add_argument('--local', action='store_true',
help='Installs Develpment version')
args = parser.parse_args() args = parser.parse_args()
if args.dev or args.local:
deployment_type = 'local'
else:
deployment_type = 'production'
KEYFILE = join(PREFIX, '.circlekeys') KEYFILE = join(PREFIX, '.circlekeys')
ks = KeyStore(KEYFILE) ks = KeyStore(KEYFILE)
...@@ -126,7 +134,7 @@ installer_sls = { ...@@ -126,7 +134,7 @@ installer_sls = {
'proxy_secret': ks.get_key('proxy_secret'), 'proxy_secret': ks.get_key('proxy_secret'),
'secret_key': ks.get_key('secret_key'), 'secret_key': ks.get_key('secret_key'),
'timezone': get_timezone(), 'timezone': get_timezone(),
'deployment_type': 'production', 'deployment_type': deployment_type,
'admin_user': 'admin', 'admin_user': 'admin',
'admin_pass': input_admin_password(), 'admin_pass': input_admin_password(),
'database': { 'database': {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment