Skip to content

Commit 078d87f

Browse files
committed
upgrade role for centos, amazonlinux & add molecule, pipelines
1 parent 5ab04c7 commit 078d87f

File tree

11 files changed

+19
-13
lines changed

11 files changed

+19
-13
lines changed

.github/workflows/molecule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
sudo apt-get update
3333
sudo apt-get install ansible -y
3434
pip3 install ansible molecule[docker] docker
35-
35+
3636
- name: 'Run molecule on the ${{ matrix.node }}'
3737
if: ${{ github.event.label.name == 'molecule' }}
3838
run: |
@@ -41,7 +41,7 @@ jobs:
4141
cat file.txt >> $GITHUB_ENV
4242
echo 'EOF' >> $GITHUB_ENV
4343
id: ls
44-
44+
4545
- name: 'PR Comment'
4646
uses: actions-ecosystem/action-create-comment@v1
4747
with:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# ignored files
22
.idea
33
*.iml
4-
*.zip
4+
*.zip

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
repos:
33

44
- repo: https://github.com/pre-commit/pre-commit-hooks.git
5-
rev: v2.2.3
5+
rev: v3.3.0
66
hooks:
77
- id: end-of-file-fixer
88
- id: trailing-whitespace
@@ -15,7 +15,7 @@ repos:
1515
- id: check-added-large-files
1616

1717
- repo: https://github.com/ansible/ansible-lint.git
18-
rev: v4.1.0
18+
rev: v4.3.7
1919
hooks:
2020
- id: ansible-lint
2121
files: \.(yaml|yml)$

meta/main.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ galaxy_info:
1818
- trusty
1919
- xenial
2020
- bionic
21+
- name: CentOS
22+
versions:
23+
- 7
24+
- name: Amazonlinux
25+
versions:
26+
- 2
2127
- name: EL
2228
versions:
2329
galaxy_tags:
@@ -27,3 +33,4 @@ galaxy_info:
2733
- ubuntu
2834
- cenos
2935
- linux
36+
- amazonlinux

molecule/amazonlinux/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ RUN systemctl set-default multi-user.target
2525
ENV init /lib/systemd/systemd
2626
VOLUME [ "/sys/fs/cgroup" ]
2727

28-
ENTRYPOINT ["/lib/systemd/systemd"]
28+
ENTRYPOINT ["/lib/systemd/systemd"]

molecule/centos/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ RUN systemctl set-default multi-user.target
2525
ENV init /lib/systemd/systemd
2626
VOLUME [ "/sys/fs/cgroup" ]
2727

28-
ENTRYPOINT ["/lib/systemd/systemd"]
28+
ENTRYPOINT ["/lib/systemd/systemd"]

molecule/ubuntu/Dockerfile.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apt-get update -qq && apt-get install -qqy \
1818
ca-certificates \
1919
curl \
2020
lxc
21-
21+
2222
# Install Docker from Docker Inc. repositories.
2323
RUN curl -sSL https://get.docker.com/ | sh
2424

@@ -44,4 +44,4 @@ RUN systemctl set-default multi-user.target
4444
ENV init /lib/systemd/systemd
4545
VOLUME [ "/sys/fs/cgroup" ]
4646

47-
ENTRYPOINT ["/lib/systemd/systemd"]
47+
ENTRYPOINT ["/lib/systemd/systemd"]

molecule/ubuntu/molecule.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,3 @@ scenario:
5454
- verify
5555
- cleanup
5656
- destroy
57-

molecule/ubuntu/playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: Converge
33
hosts: all
4-
4+
55
vars:
66
example_test_var: "Nothing_to_see_here"
77

templates/config/pool.d/extra-config.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ memory_limit = -1
4949
;
5050
upload_max_filesize = 20M
5151
post_max_size = 21M
52-
max_input_vars = 5000
52+
max_input_vars = 5000

0 commit comments

Comments
 (0)