Merge "Add Kitchen tests"
diff --git a/LICENSE b/LICENSE
index 6f2b42f..327cc68 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 tcp cloud a.s.
+Copyright (c) 2014-2019 Mirantis Inc. et al
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/README.rst b/README.rst
index 397b177..690dc0f 100644
--- a/README.rst
+++ b/README.rst
@@ -143,7 +143,7 @@
gerrit:
client:
enabled: True
- server:
+ server:
host: 10.10.10.148
user: newt
key: |
@@ -314,30 +314,3 @@
* https://github.com/openstack-infra/puppet-gerrit/
* https://gerrit-ci.gerritforge.com/
* https://github.com/morucci/exzuul
-
-Documentation and bugs
-======================
-
-* http://salt-formulas.readthedocs.io/
- Learn how to install and update salt-formulas
-
-* https://github.com/salt-formulas/salt-formula-gerrit/issues
- In the unfortunate event that bugs are discovered, report the issue to the
- appropriate issue tracker. Use the Github issue tracker for a specific salt
- formula
-
-* https://launchpad.net/salt-formulas
- For feature requests, bug reports, or blueprints affecting the entire
- ecosystem, use the Launchpad salt-formulas project
-
-* https://launchpad.net/~salt-formulas-users
- Join the salt-formulas-users team and subscribe to mailing list if required
-
-* https://github.com/salt-formulas/salt-formula-gerrit
- Develop the salt-formulas projects in the master branch and then submit pull
- requests against a specific formula
-
-* #salt-formulas @ irc.freenode.net
- Use this IRC channel in case of any questions or feedback which is always
- welcome
-
diff --git a/_modules/gerrit.py b/_modules/gerrit.py
index 8eb22a0..4f66fd2 100644
--- a/_modules/gerrit.py
+++ b/_modules/gerrit.py
@@ -24,7 +24,7 @@
groups:
- Non-Interactive Users
- Testers
- gerrit_url: http://gerrit.example.com:8080/
+ gerrit_url: https://gerrit.example.com:8080/
gerrit_admin_username: dicky
gerrit_admin_password: b0sst0nes
'''
diff --git a/debian/control b/debian/control
index d3425a6..4d3da9a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
Source: salt-formula-gerrit
-Maintainer: Ales Komarek <ales.komarek@tcpcloud.eu>
+Maintainer: Mirantis Dev <dev@mirantis.com>
Section: admin
Priority: optional
Build-Depends: debhelper (>= 9)
Standards-Version: 3.9.6
-Homepage: http://www.tcpcloud.eu
-Vcs-Browser: https://github.com/tcpcloud/salt-formula-gerrit
-Vcs-Git: https://github.com/tcpcloud/salt-formula-gerrit.git
+Homepage: https://www.mirantis.com
+Vcs-Browser: https://gerrit.mcp.mirantis.com/#/admin/projects/salt-formulas/gerrit
+Vcs-Git: https://gerrit.mcp.mirantis.com/salt-formulas/gerrit.git
Package: salt-formula-gerrit
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 7da50f7..301c44f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: salt-formula-gerrit
-Upstream-Contact:
-Source: https://github.com/tcpcloud/salt-formula-gerrit
+Upstream-Contact: Mirantis Dev <dev@mirantis.com>
+Source: https://gerrit.mcp.mirantis.com/#/admin/projects/salt-formulas/gerrit
Files: *
-Copyright: 2014-2015 tcp cloud a.s.
+Copyright: 2014-2019 Mirantis Inc. et al
License: Apache-2.0
- Copyright (C) 2014-2015 tcp cloud a.s.
+ Copyright (C) 2014-2019 Mirantis Inc. et al
.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/gerrit/init.sls b/gerrit/init.sls
index f89cd94..bffff81 100644
--- a/gerrit/init.sls
+++ b/gerrit/init.sls
@@ -1,9 +1,9 @@
{%- if pillar.gerrit is defined %}
include:
-{%- if pillar.gerrit.server is defined %}
+ {%- if pillar.gerrit.server is defined %}
- gerrit.server
-{%- endif %}
-{%- if pillar.gerrit.client is defined %}
+ {%- endif %}
+ {%- if pillar.gerrit.client is defined %}
- gerrit.client
-{%- endif %}
+ {%- endif %}
{%- endif %}
diff --git a/gerrit/map.jinja b/gerrit/map.jinja
index c3ed4ab..7c9649b 100644
--- a/gerrit/map.jinja
+++ b/gerrit/map.jinja
@@ -1,9 +1,9 @@
-
{%- load_yaml as server_defaults %}
Debian:
pkgs:
- unzip
- gitweb
+ - git-core
dir:
home: "/srv/gerrit"
site: "/srv/gerrit/review_site"
@@ -16,12 +16,13 @@
{%- load_yaml as client_defaults %}
{% set project_config = pillar.get('gerrit', {}).get('client', {}).get('dir', {}).get('project_config', '/srv/jeepyb') %}
Debian:
- homepage: "http://domain.com/"
+ homepage: "https://www.mirantis.com"
source:
engine: pkg
pkgs:
- jeepyb
- curl
+ - git-core
pkgs_salt:
- python-gerritlib
- python-pygerrit2