Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos.package
Commits
b31bcacd
Commit
b31bcacd
authored
Sep 26, 2022
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playbook/re6stnet: add option to manually specify location
parent
8f6dcb2d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
playbook/re6stnet.yml
playbook/re6stnet.yml
+5
-0
playbook/roles/re6stnet-install/tasks/main.yml
playbook/roles/re6stnet-install/tasks/main.yml
+13
-3
No files found.
playbook/re6stnet.yml
View file @
b31bcacd
...
...
@@ -13,6 +13,11 @@
private
:
no
default
:
"
http://re6stnet.nexedi.com/"
-
name
:
"
location"
prompt
:
'
Manually
enter
your
location
(ignore
if
you
want
it
detected
automatically,
format
is
"country
code,continent
code",
e.g.
"FR,EU")'
private
:
no
default
:
"
"
-
name
:
"
re6sttoken"
prompt
:
"
Please
insert
your
re6stnet
token:"
private
:
no
...
...
playbook/roles/re6stnet-install/tasks/main.yml
View file @
b31bcacd
...
...
@@ -9,8 +9,18 @@
-
include
:
sysctl.yml
-
name
:
Update Facts
set_fact
:
location_option
:
"
--location
{{
location
}}"
when
:
"
{{
location
|
length
|
int
}}
>
0"
-
name
:
Update Facts
set_fact
:
location_option
:
"
"
when
:
"
{{
location
|
length
|
int
}}
==
0"
-
name
:
Configure Re6st with re6st-conf
shell
:
"
re6st-conf
--registry
{{
re6st_registry_url
}}
-r
title
{{
computer_name
}}
--fingerprint
{{
re6st_fingerprint
}}
-d
/etc/re6stnet
--anonymous"
shell
:
"
re6st-conf
--registry
{{
re6st_registry_url
}}
-r
title
{{
computer_name
}}
--fingerprint
{{
re6st_fingerprint
}}
-d
/etc/re6stnet
--anonymous
{{
location_option
}}
"
when
:
re6st_annon == True and re6stnet_conf.stat.exists == False and "{{ computer_name }}" != "noname"
-
name
:
Update Facts
...
...
@@ -22,11 +32,11 @@
-
name
:
Configure Re6st with re6st-conf
shell
:
"
re6st-conf
--registry
{{
re6st_registry_url
}}
--token
{{
re6sttoken
}}
-r
title
{{
computer_name
}}
--fingerprint
{{
re6st_fingerprint
}}
-d
/etc/re6stnet"
shell
:
"
re6st-conf
--registry
{{
re6st_registry_url
}}
--token
{{
re6sttoken
}}
-r
title
{{
computer_name
}}
--fingerprint
{{
re6st_fingerprint
}}
-d
/etc/re6stnet
{{
location_option
}}
"
when
:
re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ re6st_fingerprint }}" != "nofingerprint"
-
name
:
Configure Re6st with re6st-conf
shell
:
"
re6st-conf
--registry
{{
re6st_registry_url
}}
--token
{{
re6sttoken
}}
-r
title
{{
re6sttoken
}}
-d
/etc/re6stnet"
shell
:
"
re6st-conf
--registry
{{
re6st_registry_url
}}
--token
{{
re6sttoken
}}
-r
title
{{
re6sttoken
}}
-d
/etc/re6stnet
{{
location_option
}}
"
when
:
re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ re6st_fingerprint }}" == "nofingerprint"
-
name
:
Recheck if configuration already exists (after running re6st-conf)
...
...
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