Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
salt
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
17
Merge Requests
1
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ce0c762a
authored
Oct 09, 2018
by
Czémán Arnold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add development options to install
Added --dev and --local args to create local devenv.
parent
26b7ba4b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
install
+1
-1
install.py
+10
-2
No files found.
install
View file @
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
$@
install.py
View file @
ce0c762a
...
@@ -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'
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment