Commit 468e8d34 by Karsa Zoltán István

has agent setup

parent 16357fc3
...@@ -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>
......
...@@ -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">
......
...@@ -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=True, has_agent = BooleanField(verbose_name=_('has agent'), default=False,
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.'))
......
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