Merge branch 'feature/rest_client' into 'master'
[WIP] Initial rest client implementation.
See merge request !1
diff --git a/README.rst b/README.rst
index d7c770f..dc9ff56 100644
--- a/README.rst
+++ b/README.rst
@@ -68,6 +68,36 @@
user: gerrit
password: ${_param:postgresql_gerrit_password}
+
+Gerrit client enforcing groups
+
+.. code-block:: yaml
+
+ gerrit:
+ client:
+ group:
+ Admin001:
+ description: admin 01
+ Admin002:
+ description: admin 02
+
+
+Gerrit client enforcing users
+
+.. code-block:: yaml
+
+ gerrit:
+ client:
+ user:
+ jdoe:
+ fullname: John Doe
+ email: "jdoe@domain.com"
+ ssh_key: ssh-rsa
+ http_password: password
+ groups:
+ - Admin001
+
+
Gerrit client enforcing projects
.. code-block:: yaml
diff --git a/_modules/gerrit.py b/_modules/gerrit.py
index c4048cf..8db9e4a 100644
--- a/_modules/gerrit.py
+++ b/_modules/gerrit.py
@@ -2,7 +2,7 @@
'''
Module for handling gerrit calls.
-:optdepends: - gerritlib Python adapter
+:optdepends: - gerritlib/pygerrit Python adapter
:configuration: This module is not usable until the following are specified
either in a pillar or in the minion's config file::
@@ -16,12 +16,26 @@
ydbuy8iuuvali2uF133kAlLqnrWfVTYQQI1OfW5glOv1L6kv94dU
-----END RSA PRIVATE KEY-----
+Examples:
+- gerrit_account:
+ username: Jenkins
+ fullname: Jenkins continuous integration tool
+ email: admin@example.com
+ groups:
+ - Non-Interactive Users
+ - Testers
+ gerrit_url: http://gerrit.example.com:8080/
+ gerrit_admin_username: dicky
+ gerrit_admin_password: b0sst0nes
'''
from __future__ import absolute_import
+import json
import logging
import os
+import urllib
+import requests.auth
LOG = logging.getLogger(__name__)
@@ -29,6 +43,7 @@
HAS_GERRIT = False
try:
from gerritlib import gerrit
+ import pygerrit.rest
HAS_GERRIT = True
except ImportError:
pass
@@ -46,28 +61,573 @@
__opts__ = {}
-def auth(**connection_args):
+# Common functions
+
+
+def _get_boolean(gerrit, path):
+ response = gerrit.get(path)
+ if response == 'ok':
+ value = True
+ elif response == '':
+ value = False
+ else:
+ raise AnsibleGerritError(
+ "Unexpected response for %s: %s" % (path, response))
+ return value
+
+
+def _get_list(gerrit, path):
+ values = gerrit.get(path)
+ return values
+
+
+def _get_string(gerrit, path):
+ try:
+ value = gerrit.get(path)
+ except requests.exceptions.HTTPError as e:
+ if e.response.status_code == 404:
+ logging.debug("Ignoring exception %s", e)
+ logging.debug("Got %s", e.response.__dict__)
+ value = None
+ else:
+ raise
+ return value
+
+
+def _set_boolean(gerrit, path, value):
+ if value:
+ gerrit.put(path)
+ else:
+ gerrit.delete(path)
+
+
+def _set_string(gerrit, path, value, field_name=None):
+ field_name = field_name or os.path.basename(path)
+
+ # Setting to '' is equivalent to deleting, so we have no need for the
+ # DELETE method.
+ headers = {'content-type': 'application/json'}
+ data = json.dumps({field_name: value})
+ gerrit.put(path, data=data, headers=headers)
+
+
+def _maybe_update_field(gerrit, path, field, gerrit_value, salt_value,
+ type='str', gerrit_api_path=None):
+
+ gerrit_api_path = gerrit_api_path or field
+ fullpath = path + '/' + gerrit_api_path
+
+ if gerrit_value == salt_value:
+ logging.info("Not updating %s: same value specified: %s", fullpath,
+ gerrit_value)
+ value = gerrit_value
+ changed = False
+ elif salt_value is None:
+ logging.info("Not updating %s: no value specified, value stays as %s",
+ fullpath, gerrit_value)
+ value = gerrit_value
+ changed = False
+ else:
+ logging.info("Changing %s from %s to %s", fullpath, gerrit_value,
+ salt_value)
+ if type == 'str':
+ _set_string(gerrit, fullpath, salt_value, field_name=field)
+ elif type == 'bool':
+ _set_boolean(gerrit, fullpath, salt_value)
+ else:
+ raise AssertionError("Unknown Ansible parameter type '%s'" % type)
+
+ value = salt_value
+ changed = True
+ return value, changed
+
+
+def _quote(name):
+ return urllib.quote(name, safe="")
+
+
+def _account_name2id(gerrit, name=None):
+ # Although we could pass an AccountInput entry here to set details in one
+ # go, it's left up to the _update_group() function, to avoid having a
+ # totally separate code path for create vs. update.
+ info = gerrit.get('/accounts/%s' % _quote(name))
+ return info['_account_id']
+
+
+def _group_name2id(gerrit, name=None):
+ # Although we could pass an AccountInput entry here to set details in one
+ # go, it's left up to the _update_group() function, to avoid having a
+ # totally separate code path for create vs. update.
+ info = gerrit.get('/groups/%s' % _quote(name))
+ return info['id']
+
+
+def _create_group(gerrit, name=None):
+ # Although we could pass an AccountInput entry here to set details in one
+ # go, it's left up to the _update_group() function, to avoid having a
+ # totally separate code path for create vs. update.
+ group_info = gerrit.put('/groups/%s' % _quote(name))
+ return group_info
+
+
+def _create_account(gerrit, username=None):
+ # Although we could pass an AccountInput entry here to set details in one
+ # go, it's left up to the _update_account() function, to avoid having a
+ # totally separate code path for create vs. update.
+ account_info = gerrit.put('/accounts/%s' % _quote(username))
+ return account_info
+
+
+def _create_account_email(gerrit, account_id, email, preferred=False,
+ no_confirmation=False):
+ logging.info('Creating email %s for account %s', email, account_id)
+
+ email_input = {
+ # Setting 'email' is optional (it's already in the URL) but it's good
+ # to double check that the email is encoded in the URL properly.
+ 'email': email,
+ 'preferred': preferred,
+ 'no_confirmation': no_confirmation,
+ }
+ logging.debug(email_input)
+
+ path = 'accounts/%s/emails/%s' % (account_id, _quote(email))
+ headers = {'content-type': 'application/json'}
+ gerrit.post(path, data=json.dumps(email_input), headers=headers)
+
+
+def _create_account_ssh_key(gerrit, account_id, ssh_public_key):
+ logging.info('Creating SSH key %s for account %s', ssh_public_key,
+ account_id)
+
+ import requests
+ from pygerrit import decode_response
+
+ path = 'accounts/%s/sshkeys' % (account_id)
+ # gerrit.post(path, data=ssh_public_key)
+
+ kwargs = {
+ "data": ssh_public_key
+ }
+ kwargs.update(gerrit.kwargs.copy())
+
+ response = requests.put(gerrit.make_url(path), **kwargs)
+
+ return gerrit.decode_response(response)
+
+
+def _create_group_membership(gerrit, account_id, group_id):
+ logging.info('Creating membership of %s in group %s', account_id, group_id)
+# group_id = _group_name2id(gerrit, group_id)
+ print group_id
+ import json
+ path = 'groups/%s/members/%s' % (_quote(group_id), account_id)
+ gerrit.put(path, data=json.dumps({}))
+
+
+def _ensure_only_member_of_these_groups(gerrit, account_id, salt_groups):
+ path = 'accounts/%s' % account_id
+ group_info_list = _get_list(gerrit, path + '/groups')
+
+ changed = False
+ gerrit_groups = []
+ for group_info in group_info_list:
+ if group_info['name'] in salt_groups:
+ logging.info("Preserving %s membership of group %s", path,
+ group_info)
+ gerrit_groups.append(group_info['name'])
+ else:
+ logging.info("Removing %s from group %s", path, group_info)
+ membership_path = 'groups/%s/members/%s' % (
+ _quote(group_info['id']), account_id)
+ try:
+ gerrit.delete(membership_path)
+ changed = True
+ except requests.exceptions.HTTPError as e:
+ if e.response.status_code == 404:
+ # This is a kludge, it'd be better to work out in advance
+ # which groups the user is a member of only via membership
+ # in a different. That's not trivial though with the
+ # current API Gerrit provides.
+ logging.info(
+ "Ignored %s; assuming membership of this group is due "
+ "to membership of a group that includes it.", e)
+ else:
+ raise
+
+ # If the user gave group IDs instead of group names, this will
+ # needlessly recreate the membership. The only actual issue will be that
+ # Ansible reports 'changed' when nothing really did change, I think.
+ #
+ # We might receive [""] when the user tries to pass in an empty list, so
+ # handle that.
+ for new_group in set(salt_groups).difference(gerrit_groups):
+ if len(new_group) > 0:
+ _create_group_membership(gerrit, account_id, new_group)
+ gerrit_groups.append(new_group)
+ changed = True
+
+ return gerrit_groups, changed
+
+
+def _ensure_only_one_account_email(gerrit, account_id, email):
+ path = 'accounts/%s' % account_id
+ email_info_list = _get_list(gerrit, path + '/emails')
+
+ changed = False
+ found_email = False
+ for email_info in email_info_list:
+ existing_email = email_info['email']
+ if existing_email == email:
+ # Since we're deleting all emails except this one, there's no need
+ # to care whether it's the 'preferred' one. It soon will be!
+ logging.info("Keeping %s email %s", path, email)
+ found_email = True
+ else:
+ logging.info("Removing %s email %s", path, existing_email)
+ gerrit.delete(path + '/emails/%s' % _quote(existing_email))
+ changed = True
+
+ if len(email) > 0 and not found_email:
+ _create_account_email(gerrit, account_id, email,
+ preferred=True, no_confirmation=True)
+ changed = True
+
+ return email, changed
+
+
+def _ensure_only_one_account_ssh_key(gerrit, account_id, ssh_public_key):
+ path = 'accounts/%s' % account_id
+ ssh_key_info_list = _get_list(gerrit, path + '/sshkeys')
+
+ changed = False
+ found_ssh_key = False
+ for ssh_key_info in ssh_key_info_list:
+ if ssh_key_info['ssh_public_key'] == ssh_public_key:
+ logging.info("Keeping %s SSH key %s", path, ssh_key_info)
+ found_ssh_key = True
+ else:
+ logging.info("Removing %s SSH key %s", path, ssh_key_info)
+ gerrit.delete(path + '/sshkeys/%i' % ssh_key_info['seq'])
+ changed = True
+
+ if len(ssh_public_key) > 0 and not found_ssh_key:
+ _create_account_ssh_key(gerrit, account_id, ssh_public_key)
+ changed = True
+
+ return ssh_public_key, changed
+
+
+def _update_account(gerrit, username=None, **params):
+ change = False
+
+ try:
+ account_info = gerrit.get('/accounts/%s' % _quote(username))
+ except requests.exceptions.HTTPError as e:
+ if e.response.status_code == 404:
+ logging.info("Account %s not found, creating it.", username)
+ account_info = _create_account(gerrit, username)
+ change = True
+ else:
+ raise
+
+ logging.debug(
+ 'Existing account info for account %s: %s', username,
+ json.dumps(account_info, indent=4))
+
+ account_id = account_info['_account_id']
+ path = 'accounts/%s' % account_id
+
+ output = {}
+ output['username'] = username
+ output['id'] = account_id
+
+ fullname, fullname_changed = _maybe_update_field(
+ gerrit, path, 'name', account_info.get('name'), params.get('fullname'))
+ output['fullname'] = fullname
+ change |= fullname_changed
+
+ # Set the value of params that the user did not provide to None.
+
+ if params.get('active') is not None:
+ active = _get_boolean(gerrit, path + '/active')
+ active, active_changed = _maybe_update_field(
+ gerrit, path, 'active', active, params['active'], type='bool')
+ output['active'] = active
+ change |= active_changed
+
+ if params.get('email') is not None:
+ email, emails_changed = _ensure_only_one_account_email(
+ gerrit, account_id, params['email'])
+ output['email'] = email
+ change |= emails_changed
+
+ if params.get('groups') is not None:
+ groups, groups_changed = _ensure_only_member_of_these_groups(
+ gerrit, account_info.get('name'), params['groups'])
+ output['groups'] = groups
+ change |= groups_changed
+
+ if params.get('http_password') is not None:
+ http_password = _get_string(gerrit, path + '/password.http')
+ http_password, http_password_changed = _maybe_update_field(
+ gerrit, path, 'http_password', http_password,
+ params.get('http_password'),
+ gerrit_api_path='password.http')
+ output['http_password'] = http_password
+ change |= http_password_changed
+
+ if params.get('ssh_key') is not None:
+ ssh_key, ssh_keys_changed = _ensure_only_one_account_ssh_key(
+ gerrit, account_id, params['ssh_key'])
+ output['ssh_key'] = ssh_key
+ change |= ssh_keys_changed
+
+ return output, change
+
+
+def _update_group(gerrit, name=None, **params):
+ change = False
+
+ try:
+ group_info = gerrit.get('/groups/%s' % _quote(name))
+ except requests.exceptions.HTTPError as e:
+ if e.response.status_code == 404:
+ logging.info("Group %s not found, creating it.", name)
+ group_info = _create_group(gerrit, name)
+ change = True
+ else:
+ raise
+
+ logging.debug(
+ 'Existing info for group %s: %s', name,
+ json.dumps(group_info, indent=4))
+
+ output = {group_info['name']: group_info}
+
+ return output, change
+
+
+# Gerrit client connectors
+
+
+def _gerrit_ssh_connection(**connection_args):
'''
Set up gerrit credentials
Only intended to be used within gerrit-enabled modules
'''
-
+
prefix = "gerrit"
# look in connection_args first, then default to config file
def get(key, default=None):
return connection_args.get('connection_' + key,
- __salt__['config.get'](prefix, {})).get(key, default)
+ __salt__['config.get'](prefix, {})).get(key, default)
host = get('host', 'localhost')
user = get('user', 'admin')
- keyfile = get('keyfile', '/var/cache/salt/minion/gerrit_rsa')
+ keyfile = get('keyfile', '/var/cache/salt/minion/gerrit_rsa')
gerrit_client = gerrit.Gerrit(host, user, keyfile=keyfile)
+
return gerrit_client
+def _gerrit_http_connection(**connection_args):
+
+ prefix = "gerrit"
+
+ # look in connection_args first, then default to config file
+ def get(key, default=None):
+ return connection_args.get(
+ 'connection_' + key,
+ __salt__['config.get'](prefix, {})).get(key, default)
+
+ host = get('host', 'localhost')
+ http_port = get('http_port', '8082')
+ protocol = get('protocol', 'http')
+ username = get('user', 'admin')
+ password = get('password', 'admin')
+
+ url = protocol+"://"+str(host)+':'+str(http_port)
+
+ auth = requests.auth.HTTPDigestAuth(
+ username, password)
+
+ gerrit = pygerrit.rest.GerritRestAPI(
+ url=url, auth=auth)
+
+ return gerrit
+
+
+# Salt modules
+
+
+def account_create(username, fullname=None, email=None, active=None, groups=[], ssh_key=None, http_password=None, **kwargs):
+ '''
+ Create a gerrit account
+
+ :param username: username
+ :param fullname: fullname
+ :param email: email
+ :param active: active
+ :param groups: array of strings
+ groups:
+ - Non-Interactive Users
+ - Testers
+ :param ssh_key: public ssh key
+ :param http_password: http password
+
+ CLI Examples:
+
+ .. code-block:: bash
+
+ salt '*' gerrit.account_create username "full name" "mail@domain.com"
+
+ '''
+ gerrit_client = _gerrit_http_connection(**kwargs)
+ output, changed = _update_account(
+ gerrit_client, **{
+ 'username': username,
+ 'fullname': fullname,
+ 'email': email,
+# 'active': active,
+ 'groups': groups,
+ 'ssh_key': ssh_key,
+ 'http_password': http_password
+ })
+ return output
+
+
+def account_update(username, fullname=None, email=None, active=None, groups=[], ssh_key=None, http_password=None, **kwargs):
+ '''
+ Create a gerrit account
+
+ :param username: username
+ :param fullname: fullname
+ :param email: email
+ :param active: active
+ :param groups: array of strings
+ groups:
+ - Non-Interactive Users
+ - Testers
+ :param ssh_key: public ssh key
+ :param http_password: http password
+
+ CLI Examples:
+
+ .. code-block:: bash
+
+ salt '*' gerrit.account_create username "full name" "mail@domain.com"
+
+ '''
+ gerrit_client = _gerrit_http_connection(**kwargs)
+ output, changed = _update_account(
+ gerrit_client, **{
+ 'username': username,
+ 'fullname': fullname,
+ 'email': email,
+# 'active': active,
+ 'groups': groups,
+ 'ssh_key': ssh_key,
+ 'http_password': http_password
+ })
+ return output
+
+def account_list(**kwargs):
+ '''
+ List gerrit accounts
+
+ CLI Examples:
+
+ .. code-block:: bash
+
+ salt '*' gerrit.account_list
+
+ '''
+ gerrit_client = _gerrit_http_connection(**kwargs)
+ ret_list = gerrit_client.get('/accounts/?q=*&n=10000')
+ ret = {}
+ for item in ret_list:
+ ret[item['username']] = item
+ return ret
+
+
+def account_get(name, **kwargs):
+ '''
+ Get gerrit account
+
+ CLI Examples:
+
+ .. code-block:: bash
+
+ salt '*' gerrit.account_get name
+
+ '''
+ gerrit_client = _gerrit_http_connection(**kwargs)
+ accounts = account_list(**kwargs)
+ if(name in accounts):
+ ret = accounts.pop(name)
+ else:
+ ret = {'Error': 'Error in retrieving account'}
+ return ret
+
+
+def group_list(**kwargs):
+ '''
+ List gerrit groups
+
+ CLI Examples:
+
+ .. code-block:: bash
+
+ salt '*' gerrit.group_list
+
+ '''
+ gerrit_client = _gerrit_http_connection(**kwargs)
+ return gerrit_client.get('/groups/')
+
+
+def group_get(groupname, **kwargs):
+ '''
+ Get gerrit group
+
+ CLI Examples:
+
+ .. code-block:: bash
+
+ salt '*' gerrit.group_get groupname
+
+ '''
+ gerrit_client = _gerrit_http_connection(**kwargs)
+ try:
+ item = gerrit_client.get('/groups/%s' % groupname)
+ ret = {item['name']: item}
+ except:
+ ret = {'Error': 'Error in retrieving account'}
+ return ret
+
+
+def group_create(name, description=None, **kwargs):
+ '''
+ Create a gerrit group
+
+ :param name: name
+
+ CLI Examples:
+
+ .. code-block:: bash
+
+ salt '*' gerrit.group_create group-name description
+
+ '''
+ gerrit_client = _gerrit_http_connection(**kwargs)
+ ret, changed = _update_group(
+ gerrit_client, **{'name': name, 'description': description})
+ return ret
+
+
def project_create(name, **kwargs):
'''
Create a gerrit project
@@ -79,10 +639,10 @@
.. code-block:: bash
salt '*' gerrit.project_create namespace/nova description='nova project'
-
+
'''
ret = {}
- gerrit_client = auth(**kwargs)
+ gerrit_client = _gerrit_ssh_connection(**kwargs)
project = project_get(name, **kwargs)
@@ -93,6 +653,7 @@
new = gerrit_client.createProject(name)
return project_get(name, **kwargs)
+
def project_get(name, **kwargs):
'''
Return a specific project
@@ -103,9 +664,8 @@
salt '*' gerrit.project_get projectname
'''
- gerrit_client = auth(**kwargs)
+ gerrit_client = _gerrit_ssh_connection(**kwargs)
ret = {}
-
projects = gerrit_client.listProjects()
if not name in projects:
return {'Error': 'Error in retrieving project'}
@@ -123,11 +683,9 @@
salt '*' gerrit.project_list
'''
- gerrit_client = auth(**connection_args)
+ gerrit_client = _gerrit_ssh_connection(**connection_args)
ret = {}
-
projects = gerrit_client.listProjects()
-
for project in projects:
ret[project] = {
'name': project
@@ -146,10 +704,10 @@
.. code-block:: bash
salt '*' gerrit.query 'status:open project:tools/gerrit limit:2'
-
+
'''
ret = {}
- gerrit_client = auth(**kwargs)
+ gerrit_client = _gerrit_ssh_connection(**kwargs)
msg = gerrit_client.query(change)
ret['query'] = msg
return ret
diff --git a/_states/gerrit.py b/_states/gerrit.py
index 8bbdb77..ebd9c6d 100644
--- a/_states/gerrit.py
+++ b/_states/gerrit.py
@@ -19,14 +19,76 @@
'''
Only load if the gerrit module is in __salt__
'''
- return 'gerrit' if 'gerrit.auth' in __salt__ else False
+ return 'gerrit' if 'gerrit.account_create' in __salt__ else False
+
+
+def account_present(name, fullname, email=None, active=None, groups=[], ssh_key=None, http_password=None, **kwargs):
+ '''
+ Ensures that the gerrit account exists
+
+ :param name: username
+ :param fullname: fullname
+ :param email: email
+ :param active: active
+ :param groups: array of strings
+ groups:
+ - Non-Interactive Users
+ - Testers
+ :param ssh_key: public ssh key
+ :param http_password: http password
+
+ '''
+ ret = {'name': name,
+ 'changes': {},
+ 'result': True,
+ 'comment': 'Account "{0}" already exists'.format(name)}
+
+ # Check if account is already present
+ account = __salt__['gerrit.account_get'](name, **kwargs)
+
+ if 'Error' not in account:
+ # Update account
+ __salt__['gerrit.account_update'](name, fullname, email, active, groups, ssh_key, http_password, **kwargs)
+ ret['comment'] = 'Account "{0}" has been updated'.format(name)
+ ret['changes']['Account'] = 'Updated'
+ else:
+ # Create account
+ __salt__['gerrit.account_create'](name, fullname, email, active, groups, ssh_key, http_password, **kwargs)
+ ret['comment'] = 'Account "{0}" has been added'.format(name)
+ ret['changes']['Account'] = 'Created'
+ return ret
+
+
+def group_present(name, description=None, **kwargs):
+ '''
+ Ensures that the gerrit group exists
+
+ :param name: group name
+ '''
+ ret = {'name': name,
+ 'changes': {},
+ 'result': True,
+ 'comment': 'Group "{0}" already exists'.format(name)}
+
+ # Check if group is already present
+ group = __salt__['gerrit.group_get'](name, **kwargs)
+
+ if 'Error' not in group:
+ # Update group
+ pass
+ else:
+ # Create group
+ __salt__['gerrit.group_create'](name, description, **kwargs)
+ ret['comment'] = 'Group "{0}" has been added'.format(name)
+ ret['changes']['Group'] = 'Created'
+ return ret
def project_present(name, description=None, **kwargs):
'''
Ensures that the gerrit project exists
- :param name: new project name
+ :param name: project name
:param description: short project description
'''
ret = {'name': name,
diff --git a/gerrit/client/group.sls b/gerrit/client/group.sls
new file mode 100644
index 0000000..e510e1a
--- /dev/null
+++ b/gerrit/client/group.sls
@@ -0,0 +1,15 @@
+{% from "gerrit/map.jinja" import client with context %}
+{%- if client.enabled %}
+
+{%- for group_name, group in client.group.iteritems() %}
+
+gerrit_client_group_{{ group_name }}:
+ gerrit.group_present:
+ - name: {{ group_name }}
+ {%- if group.description is defined %}
+ - description: {{ group.description }}
+ {%- endif %}
+
+{%- endfor %}
+
+{%- endif %}
\ No newline at end of file
diff --git a/gerrit/client/init.sls b/gerrit/client/init.sls
index 697240b..2c9047c 100644
--- a/gerrit/client/init.sls
+++ b/gerrit/client/init.sls
@@ -1,3 +1,5 @@
include:
- gerrit.client.service
+- gerrit.client.group
+- gerrit.client.user
- gerrit.client.project
diff --git a/gerrit/client/user.sls b/gerrit/client/user.sls
new file mode 100644
index 0000000..3b704c6
--- /dev/null
+++ b/gerrit/client/user.sls
@@ -0,0 +1,40 @@
+{% from "gerrit/map.jinja" import client with context %}
+{%- if client.enabled %}
+
+{%- for group_name, group in client.group.iteritems() %}
+
+gerrit_client_group_{{ group_name }}:
+ gerrit.group_present:
+ - name: {{ group_name }}
+ {%- if group.description is defined %}
+ - description: {{ group.description }}
+ {%- endif %}
+
+{%- endfor %}
+
+{%- for account_name, account in client.user.iteritems() %}
+
+gerrit_client_account_{{ account_name }}:
+ gerrit.account_present:
+ - name: {{ account_name }}
+ - fullname: {{ account.fullname }}
+ - active: {{ account.get('active', True) }}
+ {%- if account.email is defined %}
+ - email: {{ account.email }}
+ {%- endif %}
+ {%- if account.http_password is defined %}
+ - http_password: {{ account.http_password }}
+ {%- endif %}
+ {%- if account.ssh_key is defined %}
+ - ssh_key: {{ account.ssh_key }}
+ {%- endif %}
+ {%- if account.groups is defined %}
+ - groups:
+ {%- for group in account.groups %}
+ - {{ group }}
+ {% endfor %}
+ {%- endif %}
+
+{%- endfor %}
+
+{%- endif %}
\ No newline at end of file
diff --git a/gerrit/files/_gerrit.conf b/gerrit/files/_gerrit.conf
index 87f2f41..85d04df 100644
--- a/gerrit/files/_gerrit.conf
+++ b/gerrit/files/_gerrit.conf
@@ -1,7 +1,16 @@
{%- from "gerrit/map.jinja" import client with context %}
gerrit:
host: {{ client.server.host }}
- {%- if client.server.user is defined %}
user: {{ client.server.user }}
+ {%- if client.server.protocol is defined %}
+ protocol: {{ client.server.protocol }}
+ {%- endif %}
+ {%- if client.server.http_port is defined %}
+ http_port: {{ client.server.http_port }}
+ {%- endif %}
+ {%- if client.server.password is defined %}
+ password: {{ client.server.password }}
+ {%- endif %}
+ {%- if client.server.key is defined %}
keyfile: {{ client.config.key }}
{%- endif %}
\ No newline at end of file