Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE3
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
5
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
468e8d34
authored
Aug 09, 2022
by
Karsa Zoltán István
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
has agent setup
parent
16357fc3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletions
+3
-1
circle/dashboard/templates/dashboard/_ci-data-help.html
+1
-0
circle/dashboard/templates/dashboard/_template-create.html
+1
-0
circle/vm/models/instance.py
+1
-1
No files found.
circle/dashboard/templates/dashboard/_ci-data-help.html
View file @
468e8d34
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
<li>
{% trans "
<code>
net.vlans
</code>
- associated vlans: list of objects (name: vlan name, ipv4/ipv6: host ip in vlan)" %}
</li>
<li>
{% trans "
<code>
net.vlans
</code>
- associated vlans: list of objects (name: vlan name, ipv4/ipv6: host ip in vlan)" %}
</li>
<li>
{% trans "
<code>
ssh.keys
</code>
- owner's ssh-keys dictionary: the key is the ssh-key's name" %}
</li>
<li>
{% trans "
<code>
ssh.keys
</code>
- owner's ssh-keys dictionary: the key is the ssh-key's name" %}
</li>
<li>
{% trans "
<code>
ci.rndstr(len: int)
</code>
- function: make random string with 'len' charachters lenght" %}
</li>
<li>
{% trans "
<code>
ci.rndstr(len: int)
</code>
- function: make random string with 'len' charachters lenght" %}
</li>
<li>
{% trans "
<code>
ci.loadjson(url: str)
</code>
- load json object from remote url" %}
</li>
</ul>
</ul>
<p>
{% trans "Filters: hash - sha512 hash method" %}
</p>
<p>
{% trans "Filters: hash - sha512 hash method" %}
</p>
<p>
{% trans "Use this commands, to clean cloud-init setup (for save as template example):" %}
</p>
<p>
{% trans "Use this commands, to clean cloud-init setup (for save as template example):" %}
</p>
...
...
circle/dashboard/templates/dashboard/_template-create.html
View file @
468e8d34
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
{{ form.req_traits|as_crispy_field }}
{{ form.req_traits|as_crispy_field }}
{{ form.description|as_crispy_field }}
{{ form.description|as_crispy_field }}
{{ form.system|as_crispy_field }}
{{ form.system|as_crispy_field }}
{{ form.has_agent|as_crispy_field }}
<hr/>
<hr/>
{% include "dashboard/_ci-data-help.html" %}
{% include "dashboard/_ci-data-help.html" %}
<div
class=
"alert alert-warning"
>
<div
class=
"alert alert-warning"
>
...
...
circle/vm/models/instance.py
View file @
468e8d34
...
@@ -157,7 +157,7 @@ class VirtualMachineDescModel(BaseResourceConfigModel):
...
@@ -157,7 +157,7 @@ class VirtualMachineDescModel(BaseResourceConfigModel):
help_text
=
(
_
(
'Name of operating system in format like '
help_text
=
(
_
(
'Name of operating system in format like '
'"Ubuntu 12.04 LTS Desktop amd64".'
)))
'"Ubuntu 12.04 LTS Desktop amd64".'
)))
tags
=
TaggableManager
(
blank
=
True
,
verbose_name
=
_
(
"tags"
))
tags
=
TaggableManager
(
blank
=
True
,
verbose_name
=
_
(
"tags"
))
has_agent
=
BooleanField
(
verbose_name
=
_
(
'has agent'
),
default
=
Tru
e
,
has_agent
=
BooleanField
(
verbose_name
=
_
(
'has agent'
),
default
=
Fals
e
,
help_text
=
_
(
help_text
=
_
(
'If the machine has agent installed, and '
'If the machine has agent installed, and '
'the manager should wait for its start.'
))
'the manager should wait for its start.'
))
...
...
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