Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main to master #133

Closed
wants to merge 61 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
8fc0578
Merge pull request #121 from buluma/master
buluma Sep 10, 2022
3c04b41
Updated CHANGELOG.md on "2022-09-10 07:08:26"
Sep 10, 2022
46c88c3
Merge branch 'master'
buluma Oct 30, 2022
bedf90b
Updated CHANGELOG.md on "2022-10-30 18:35:22"
Oct 30, 2022
89a4c6e
skip non-latest suse for debug
buluma Nov 8, 2022
b6c383d
Update molecule.yml
buluma Nov 8, 2022
cdd5699
Merge pull request #122 from buluma/buluma-suse-1
buluma Nov 8, 2022
4fddf90
Updated CHANGELOG.md on "2022-11-08 12:00:34"
Nov 8, 2022
68a3f6c
Update molecule.yml
buluma Nov 14, 2022
550340a
Updated CHANGELOG.md on "2022-11-14 05:28:09"
Nov 14, 2022
00955d0
Update .gitlab-ci.yml file
buluma Dec 19, 2022
521d020
Ansible 7 is out. Drop ansible 4 testing.
buluma Jan 1, 2023
c0fdf31
Merge branch 'main' of https://gitlab.com/buluma/ansible-role-bootstrap
buluma Jan 1, 2023
0fb0ec8
Merge branch 'main' of https://github.com/buluma/ansible-role-bootstrap
buluma Jan 1, 2023
d3bf480
merge
buluma Jan 1, 2023
b7c44f0
Updated CHANGELOG.md on "2023-01-01 05:56:02"
Jan 1, 2023
b73ff7d
merge
buluma Jan 1, 2023
900d7ea
merge
buluma Jan 1, 2023
61f0753
Update molecule.yml
buluma Jan 9, 2023
e3d1ca5
Update tox.ini
buluma Jan 9, 2023
f0df0bf
Update .ansible-lint
buluma Jan 29, 2023
a7bcfbb
Improve the task key order to: name, become, block, rescue
buluma Jan 29, 2023
09ff3a0
Update .ansible-lint
buluma Jan 29, 2023
5ab347a
Merge branch 'main' of https://github.com/buluma/ansible-role-bootstrap
buluma Jan 29, 2023
3d0d9b3
Update main.yml
buluma Jan 29, 2023
b8ee636
tox test
buluma Jan 29, 2023
372d7e0
Bump buluma/gitlab-mirror-ci-action from 1.0.6 to 1.0.7
dependabot[bot] Feb 6, 2023
a77c0aa
Merge pull request #125 from buluma/dependabot/github_actions/buluma/…
buluma Feb 25, 2023
c1126d2
Updated CHANGELOG.md on "2023-02-25 18:19:13"
Feb 25, 2023
478bc65
Merge branch 'main' of https://github.com/buluma/ansible-role-bootstrap
buluma Feb 27, 2023
1bf4ab2
Update molecule.yml
buluma Feb 27, 2023
14b4f8d
Updated CHANGELOG.md on "2023-02-27 05:33:33"
Feb 27, 2023
1419440
Merge branch 'main' of https://github.com/buluma/ansible-role-bootstrap
buluma Feb 27, 2023
04fbf1c
fix #126
buluma Feb 27, 2023
a3230ac
restore distros
buluma Feb 27, 2023
e951c80
Update molecule.yml
buluma Feb 27, 2023
a11382f
var-spacing
buluma Mar 12, 2023
36e3a3f
Molecule 5 is ready.
buluma Apr 25, 2023
b14b335
Updated CHANGELOG.md on "2023-04-25 08:17:27"
Apr 25, 2023
af16f24
Update molecule.yml
buluma Apr 25, 2023
d60d081
Update molecule.yml
buluma Apr 25, 2023
a672bf0
Update molecule.yml
buluma Apr 25, 2023
675ac56
Update requirements.txt
buluma May 4, 2023
4bc2395
Update tox.ini
buluma May 4, 2023
21c07fa
pin versions due to docker/ansible bugs
buluma May 5, 2023
23eeda7
Updated CHANGELOG.md on "2023-05-05 15:16:01"
May 5, 2023
2a004cf
kali linux
buluma May 16, 2023
899014e
Updated CHANGELOG.md on "2023-05-16 18:30:41"
May 16, 2023
2919b1e
Update tox.ini
buluma May 16, 2023
77f7f4c
Bump buluma/molecule-action from 5.0.4 to 5.0.7
dependabot[bot] May 29, 2023
5efccce
Merge pull request #130 from buluma/dependabot/github_actions/buluma/…
buluma May 29, 2023
43eeb94
Updated CHANGELOG.md on "2023-05-29 05:10:59"
May 29, 2023
b710a60
Bump buluma/molecule-action from 5.0.7 to 5.0.8
dependabot[bot] Jul 24, 2023
7ce7211
Merge pull request #131 from buluma/dependabot/github_actions/buluma/…
buluma Oct 30, 2023
04b64d2
Updated CHANGELOG.md on "2023-10-30 11:36:25"
Oct 30, 2023
28b159f
bulk updates
buluma Oct 30, 2023
00c2703
Update galaxy.yml
buluma Oct 30, 2023
511f267
Updated CHANGELOG.md on "2023-10-30 12:12:42"
Oct 30, 2023
d40b8b3
bulk 1
buluma Oct 30, 2023
ee672ea
Update molecule.yml
buluma Oct 30, 2023
1cae111
Merge branch 'master' into main
buluma Oct 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
# Ansible managed
#
exclude_paths:
- ./meta/preferences.yml
- ./molecule/default/prepare.yml
- ./molecule/default/converge.yml
- ./molecule/default/verify.yml
- ./molecule/default/collections.yml
- ./.tox
- ./.cache
- ./.github
- ./requirements.yml
- meta/preferences.yml
- molecule/default/prepare.yml
- molecule/default/converge.yml
- molecule/default/verify.yml
- molecule/default/collections.yml
- .tox
- .cache
- .github
- requirements.yml

skip_list:
- var-spacing
- yaml[truthy]

enable_list:
- name[prefix]
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
github: buluma
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ Show at least the error, possible related output, maybe just all the output.
- Control node OS: [e.g. Debian 9] (`cat /etc/os-release`)
- Control node Ansible version: [e.g. 2.9.1] (`ansible --version`)
- Managed node OS: [e.g. CentOS 7] (`cat /etc/os-release`)

Please consider [sponsoring me](https://github.com/sponsors/buluma).
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ Why is this feature required?
## Additional context

Add any other context about the feature request here.

Please consider [sponsoring me](https://github.com/sponsors/buluma).
2 changes: 1 addition & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
repository:
description: Prepare your system to be managed by Ansible.
homepage: https://buluma.github.io/
topics: bootstrap, python, sudo, ansible, molecule, tox, playbook, hacktoberfest
topics: bootstrap, python, sudo, system, ansible, molecule, tox, playbook
2 changes: 1 addition & 1 deletion .github/workflows/galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: galaxy
uses: robertdebock/galaxy-action@1.2.1
uses: buluma/galaxy-action@v10.30.23
with:
galaxy_api_key: ${{ secrets.galaxy_api_key }}
2 changes: 1 addition & 1 deletion .github/workflows/gitlab_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: always()
- uses: actions/checkout@v3
- name: Mirror + trigger CI
uses: buluma/[email protected].6
uses: buluma/[email protected].7
with:
args: "buluma/ansible-role-bootstrap"
env:
Expand Down
19 changes: 8 additions & 11 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- master
- main
- testing
- buluma-suse-1
paths-ignore:
- '**/README.md'
- '**/CHANGELOG.md'
Expand All @@ -28,13 +29,9 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: checkout
uses: actions/checkout@v3
with:
path: "${{ github.repository }}"
- name: molecule
uses: buluma/[email protected]
with:
command: lint
uses: actions/checkout@v4
- name: ansible-lint
uses: ansible-community/ansible-lint-action@main
test:
needs:
- lint
Expand All @@ -57,6 +54,8 @@ jobs:
tag: "latest"
- image: "debian-systemd"
tag: "buster"
- image: "kali"
tag: "latest"
- image: "fedora-systemd"
tag: "35"
- image: "fedora-systemd"
Expand All @@ -65,8 +64,6 @@ jobs:
tag: "rawhide"
- image: "docker-opensuse-systemd"
tag: "latest"
- image: "docker-opensuse-systemd"
tag: "15.4"
- image: "docker-ubuntu-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
Expand All @@ -75,15 +72,15 @@ jobs:
tag: "bionic"
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: "${{ github.repository }}"
- name: disable apparmor for mysql
run: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
- name: parse apparmor for mysql
run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
- name: molecule
uses: buluma/[email protected].1
uses: buluma/[email protected].9
with:
image: ${{ matrix.config.image }}
tag: ${{ matrix.config.tag }}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
.tox
.cache
.DS_Store
./molecule_tests.sh
63 changes: 10 additions & 53 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
---
image: "buluma/github-action-molecule:4.0.9"

services:
- docker:dind
image: "buluma/github-action-molecule:5.0.9"

variables:
DOCKER_HOST: "tcp://docker:2375"
PY_COLORS: 1

molecule:
stage: build
allow_failure: true
script:
- if [ -f tox.ini ] ; then tox ; fi
- if [ ! -f tox.ini ] ; then molecule test ; fi
- molecule test
rules:
- if: $CI_COMMIT_REF_NAME == "master"
retry: 1
allow_failure: true
parallel:
matrix:
- image: "alpine-openrc"
Expand All @@ -32,60 +25,24 @@ molecule:
- image: "debian-systemd"
tag: "latest"
- image: "debian-systemd"
tag: "buster"
tag: "bullseye"
- image: "fedora-systemd"
tag: "35"
tag: "37"
- image: "fedora-systemd"
tag: "latest"
- image: "fedora-systemd"
tag: "rawhide"
- image: "docker-opensuse-systemd"
tag: "latest"
- image: "docker-opensuse-systemd"
tag: "15.4"
- image: "docker-ubuntu-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
tag: "focal"
- image: "docker-ubuntu-systemd"
tag: "bionic"
- image: "docker-ubuntu-systemd"
tag: "lunar"

testing:
stage: test
needs: []
galaxy:
script:
- if [ -f tox.ini ] ; then tox ; fi
- if [ ! -f tox.ini ] ; then molecule test ; fi
- ansible-galaxy role import --api-key ${GALAXY_API_KEY} buluma ${CI_PROJECT_NAME}
rules:
- if: $CI_COMMIT_REF_NAME == "testing"
retry: 1
parallel:
matrix:
- image: "alpine-openrc"
tag: "latest"
- image: "amazonlinux"
tag: "latest"
- image: "enterpriselinux"
tag: "7"
- image: "enterpriselinux"
tag: "8"
- image: "enterpriselinux"
tag: "latest"
- image: "debian-systemd"
tag: "latest"
- image: "debian-systemd"
tag: "buster"
- image: "fedora-systemd"
tag: "35"
- image: "fedora-systemd"
tag: "latest"
- image: "fedora-systemd"
tag: "rawhide"
- image: "docker-opensuse-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
tag: "focal"
- image: "docker-ubuntu-systemd"
tag: "bionic"
- if: $CI_COMMIT_TAG != null
5 changes: 2 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-added-large-files

- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
rev: v1.32.0
hooks:
- id: yamllint
args: [-c=.yamllint]
Expand All @@ -19,7 +19,6 @@ repos:
- id: ansible_role_find_unused_variable
- id: ansible_role_find_empty_files
- id: ansible_role_find_empty_directories
- id: ansible_role_fix_readability
- id: ansible_role_find_undefined_handlers
- id: ansible_role_find_unquoted_values
- id: ansible_role_find_horizontal_when
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ In the comment-box, you can [refer to the issue number](https://help.github.com/
Now I'll get a message that you've added some code. Thank you, really.

CI starts to test your changes. You can follow the progress on GitHub.

Please consider [sponsoring me](https://github.com/sponsors/buluma).
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

Apache License
Version 2.0, 08 2022
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
Expand Down Expand Up @@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2022 Michael Buluma ([email protected])
Copyright 2023 Shadow Walker ([email protected])

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
48 changes: 25 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ Prepare your system to be managed by Ansible.

|GitHub|GitLab|Quality|Downloads|Version|Issues|Pull Requests|
|------|------|-------|---------|-------|------|-------------|
|[![github](https://github.com/buluma/ansible-role-bootstrap/workflows/Ansible%20Molecule/badge.svg)](https://github.com/buluma/ansible-role-bootstrap/actions)|[![gitlab](https://gitlab.com/buluma/ansible-role-bootstrap/badges/master/pipeline.svg)](https://gitlab.com/buluma/ansible-role-bootstrap)|[![quality](https://img.shields.io/ansible/quality/57824)](https://galaxy.ansible.com/buluma/bootstrap)|[![downloads](https://img.shields.io/ansible/role/d/57824)](https://galaxy.ansible.com/buluma/bootstrap)|[![Version](https://img.shields.io/github/release/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/releases/)|[![Issues](https://img.shields.io/github/issues/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/issues/)|[![PullRequests](https://img.shields.io/github/issues-pr-closed-raw/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/pulls/)|
|[![github](https://github.com/buluma/ansible-role-bootstrap/workflows/Ansible%20Molecule/badge.svg)](https://github.com/buluma/ansible-role-bootstrap/actions)|[![gitlab](https://gitlab.com/shadowwalker/ansible-role-bootstrap/badges/master/pipeline.svg)](https://gitlab.com/shadowwalker/ansible-role-bootstrap)|[![quality](https://img.shields.io/ansible/quality/)](https://galaxy.ansible.com/buluma/bootstrap)|[![downloads](https://img.shields.io/ansible/role/d/)](https://galaxy.ansible.com/buluma/bootstrap)|[![Version](https://img.shields.io/github/release/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/releases/)|[![Issues](https://img.shields.io/github/issues/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/issues/)|[![PullRequests](https://img.shields.io/github/issues-pr-closed-raw/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/pulls/)|

## [Example Playbook](#example-playbook)

This example is taken from `molecule/default/converge.yml` and is tested on each push, pull request and release.
This example is taken from [`molecule/default/converge.yml`](https://github.com/buluma/ansible-role-bootstrap/blob/master/molecule/default/converge.yml) and is tested on each push, pull request and release.

```yaml
---
- name: Converge
Expand All @@ -27,24 +28,28 @@ This example is taken from `molecule/default/converge.yml` and is tested on each
- role: buluma.bootstrap
```

Also see a [full explanation and example](https://buluma.github.io/how-to-use-these-roles.html) on how to use these roles.

## [Role Variables](#role-variables)

The default values for the variables are set in `defaults/main.yml`:
The default values for the variables are set in [`defaults/main.yml`](https://github.com/buluma/ansible-role-bootstrap/blob/master/defaults/main.yml):

```yaml
---
# defaults file for bootstrap

# Do you want to wait for the host to be available?
bootstrap_wait_for_host: no

# The number of seconds you want to wait during connection test before failing.
bootstrap_timeout: 3

# Set role to use "become" or not.
bootstrap_become: yes
```

## [Requirements](#requirements)

- pip packages listed in [requirements.txt](https://github.com/buluma/ansible-role-bootstrap/blob/main/requirements.txt).
- pip packages listed in [requirements.txt](https://github.com/buluma/ansible-role-bootstrap/blob/master/requirements.txt).


## [Context](#context)
Expand All @@ -61,29 +66,20 @@ This role has been tested on these [container images](https://hub.docker.com/u/b

|container|tags|
|---------|----|
|alpine|all|
|amazon|Candidate|
|el|all|
|debian|all|
|fedora|all|
|opensuse|all|
|ubuntu|all|
|[Alpine](https://hub.docker.com/repository/docker/buluma/alpine/general)|all|
|[Amazon](https://hub.docker.com/repository/docker/buluma/amazonlinux/general)|Candidate|
|[EL](https://hub.docker.com/repository/docker/buluma/enterpriselinux/general)|all|
|[Debian](https://hub.docker.com/repository/docker/buluma/debian/general)|all|
|[Fedora](https://hub.docker.com/repository/docker/buluma/fedora/general)|all|
|[opensuse](https://hub.docker.com/repository/docker/buluma/opensuse/general)|all|
|[Ubuntu](https://hub.docker.com/repository/docker/buluma/ubuntu/general)|all|

The minimum version of Ansible required is 2.10, tests have been done to:
The minimum version of Ansible required is 2.12, tests have been done to:

- The previous version.
- The current version.
- The development version.

## [Exceptions](#exceptions)

Some roles can't run on a specific distribution or version. Here are some exceptions.

| variation | reason |
|---------------------------|------------------------|
| alpine:edge | Failed to create temporary directory. |


If you find issues, please register them in [GitHub](https://github.com/buluma/ansible-role-bootstrap/issues)

## [Changelog](#changelog)
Expand All @@ -92,8 +88,14 @@ If you find issues, please register them in [GitHub](https://github.com/buluma/a

## [License](#license)

Apache-2.0
[Apache-2.0](https://github.com/buluma/ansible-role-bootstrap/blob/master/LICENSE).

## [Author Information](#author-information)

[buluma](https://buluma.github.io/)

Please consider [sponsoring me](https://github.com/sponsors/buluma).

### [Special Thanks](#special-thanks)

Template inspired by [Robert de Bock](https://github.com/robertdebock)
Loading
Loading