Verified Commit 3077695e authored by Maciej Delmanowski's avatar Maciej Delmanowski

Merge branch 'drybjed-mazer-fixes'

parents 2fd45e3c c41f75e5
Pipeline #62601122 passed with stages
in 37 minutes and 54 seconds
......@@ -5,6 +5,7 @@
### Ansible ###
**/*.retry
ansible/releases/
### Emacs ###
# -*- mode: gitignore; -*-
......
......@@ -2,6 +2,7 @@
### Ansible ###
*.retry
ansible/releases/
### Emacs ###
# -*- mode: gitignore; -*-
......
......@@ -115,6 +115,12 @@ Added
restricted to SFTP operations (SFTPonly) with the new ``item.chroot``
parameter. This is a replacement for the ``debops.sftpusers`` role.
- Support for Ansible Collections managed by the `Mazer`__ Content Manager has
been implemented in the repository. Ansible Collections will be usable after
June 2019, when support for them is enabled in the Ansible Galaxy service.
.. __: https://github.com/ansible/mazer
Changed
~~~~~~~
......
......@@ -25,6 +25,10 @@ DebOps can be installed in different ways depending on your needs:
are interested only in specific DebOps roles and you don't want to use the
additional scripts to manage your environments.
.. warning:: Installation using Mazer collections will be available after
June 2019 when new functionality is implemented in the Ansible
Galaxy website.
In any case, the installation will be performed on a Linux, macOS or Windows
(WSL) computer which will be called the "Ansible Controller". This machine will
be used to execute Ansible commands against other, remote hosts which will be
......@@ -292,6 +296,10 @@ you have to use the `Mazer`__ content manager.
.. __: https://galaxy.ansible.com/debops/debops
.. __: https://galaxy.ansible.com/docs/mazer/index.html
.. warning:: Installation using Mazer collections will be available after
June 2019 when new functionality is implemented in the Ansible
Galaxy website.
After `installing Mazer using your preferred method`__, you can download the
DebOps repository by issuing the command:
......
......@@ -16,6 +16,10 @@ check: fail-if-git-dirty
clean: ## Clean up project directory
clean: clean-tests clean-sdist clean-wheel
.PHONY: collection
collection: ## Build collection of Ansible artifacts with Mazer
collection: make-collection
.PHONY: versions
versions: ## Check versions of upstream software
versions: check-versions
......@@ -70,6 +74,10 @@ sdist-sign: ## Create signed Python sdist package
sdist-sign: sdist
@gpg --detach-sign --armor dist/debops-*.tar.gz
.PHONY: make-collection
make-collection:
@lib/mazer/make-collection
.PHONY: clean-sdist
clean-sdist:
@rm -vrf debops.egg-info dist/debops-*.tar.gz*
......
---
# Configuration file used by Mazer to build a collection of Ansible artifacts.
#
# Use the 'make collection' command in the root of the DebOps repository to
# create a collection; the script needs to copy specific files to be included
# in the resulting tarball.
namespace: "debops"
name: "debops"
version: "0.8.1"
description: "Your Debian-based data center in a box"
authors:
- "Maciej Delmanowski <drybjed@gmail.com>"
- "DebOps Developers <debops-users@lists.debops.org>"
repository: "https://github.com/debops/debops"
documentation: "https://docs.debops.org/"
homepage: "https://debops.org/"
issues: "https://github.com/debops/debops/issues"
dependencies: {}
readme: "README.md"
license:
- "GPL-3.0-or-later"
license_file: "LICENSE"
tags:
- "debian"
- "ubuntu"
- "sysadmin"
- "cluster"
- "datacenter"
......@@ -742,7 +742,7 @@ slapd__snapshot_cron_jobs: [ 'daily', 'weekly', 'monthly' ]
# or subnets can be blocked using the ``slapd__*_deny`` variables.
#
# If ``False``, the role will block connections to the OpenLDAP via the system
# firwall and TCP Wrappers from any host; hosts that can connect must be
# firewall and TCP Wrappers from any host; hosts that can connect must be
# specified via the ``slapd__*_allow`` variables.
slapd__accept_any: True
......@@ -820,6 +820,7 @@ slapd__logrotate__dependent_config:
compress
comment: 'OpenLDAP audit logs'
# ]]]
# .. envvar:: slapd__python__dependent_packages3 [[[
#
# Configuration for the :ref:`debops.python` Ansible role.
......
#!/usr/bin/env bash
# Build a Mazer collection tarball with Ansible artifacts
# Usage: run "make collection" in the root of the repository
# Copyright (C) 2019 Maciej Delmanowski <drybjed@gmail.com>
# Copyright (C) 2019 DebOps https://debops.org/
set -o nounset -o pipefail -o errexit
# Check if we are in the correct directory
if ! [ -f ansible/galaxy.yml ] ; then
printf "%s\n" "Error: this script needs to be executed in the root of the DebOps repository"
exit 1
fi
# Check if mazer is installed
if ! type mazer > /dev/null 2>&1 ; then
printf "%s\n" "Error: mazer not found"
exit 1
fi
# Check if the repository is in a consistent state
if ! git diff --quiet && git diff --cached --quiet ; then
printf "%s\n" "Error: there are uncommitted changes in the repository"
git status --short
exit 1
fi
file_list=(
README.md
LICENSE
INSTALL.rst
CHANGELOG.rst
)
for filename in "${file_list[@]}" ; do
cp "${filename}" ansible/
done
pushd ansible > /dev/null
mazer build
popd > /dev/null
for filename in "${file_list[@]}" ; do
rm -f "ansible/${filename}"
done
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 to comment