Browse Source

[UPD] Latest cookie

master
Justin Lecher 2 days ago
parent
commit
346e500124
  1. 2
      roles/consul/.cruft.json
  2. 1
      roles/consul/Makefile
  3. 2
      roles/consul/meta/main.yml
  4. 12
      roles/consul/molecule/default/molecule.yml
  5. 29
      roles/hashicorp_repo/.cruft.json
  6. 32
      roles/hashicorp_repo/Makefile
  7. 9
      roles/hashicorp_repo/meta/main.yml
  8. 2
      roles/hashicorp_repo/molecule/default/converge.yml
  9. 12
      roles/hashicorp_repo/molecule/default/molecule.yml
  10. 2
      roles/hashicorp_repo/tests/test.yml
  11. 2
      roles/nomad/.cruft.json
  12. 12
      roles/nomad/molecule/default/molecule.yml

2
roles/consul/.cruft.json

@ -1,6 +1,6 @@
{
"template": "git@git.ercpe.de:justin/cookiecutter-ansible-role.git",
"commit": "56f6e09c950a09b629086ddabb74d427b655f7a0",
"commit": "111c3ab58286a3e1a70addab979bd656d72dfac6",
"context": {
"cookiecutter": {
"full_name": "Justin Lecher",

1
roles/consul/Makefile

@ -19,7 +19,6 @@ help:
cruft-update:
git stash
$(PIPENV) cruft update --allow-untracked-files
git stash pop
################################################################################
#

2
roles/consul/meta/main.yml

@ -4,7 +4,7 @@ galaxy_info:
description: "Install and Configure HashiCorps consul"
role_name: "consul"
namespace: "jlec.hashicorp"
namespace: "jlec"
license: Apache-2.0
min_ansible_version: 2.1

12
roles/consul/molecule/default/molecule.yml

@ -16,18 +16,6 @@ platforms:
- SYS_ADMIN
pre_build_image: true
privileged: true
- name: ansible-jlec.hashicorp.consul-debian
image: geerlingguy/docker-debian10-ansible
command: "/lib/systemd/systemd"
tmpfs:
- /run
- /tmp
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
capabilities:
- SYS_ADMIN
pre_build_image: true
privileged: true
- name: ansible-jlec.hashicorp.consul-ubuntu
image: geerlingguy/docker-ubuntu2004-ansible
command: "/lib/systemd/systemd"

29
roles/hashicorp_repo/.cruft.json

@ -1,16 +1,17 @@
{
"template": "git@git.ercpe.de:justin/cookiecutter-ansible-role.git",
"commit": "a671e38c6a10336aea815ac2654c339f5d9123b7",
"context": {
"cookiecutter": {
"full_name": "Justin Lecher",
"email": "justin@jlec.de",
"ansible_namespace": "jlec",
"ansible_collection": "hashicorp",
"role_name": "hashicorp_repo",
"role_short_description": "Configure HashiCorp repositories",
"_template": "git@git.ercpe.de:justin/cookiecutter-ansible-role.git"
}
},
"directory": null
"template": "git@git.ercpe.de:justin/cookiecutter-ansible-role.git",
"commit": "111c3ab58286a3e1a70addab979bd656d72dfac6",
"context": {
"cookiecutter": {
"full_name": "Justin Lecher",
"email": "justin@jlec.de",
"ansible_namespace": "jlec",
"ansible_collection": "hashicorp",
"role_name": "hashicorp_repo",
"role_short_description": "Configure HashiCorp repositories",
"_template": "git@git.ercpe.de:justin/cookiecutter-ansible-role.git"
}
},
"directory": null,
"checkout": null
}

32
roles/hashicorp_repo/Makefile

@ -1,21 +1,44 @@
MOLECULE_ARGS ?= --verbose
MOLECULE = pipenv run molecule ${MOLECULE_ARGS}
PIPENV := pipenv run
PYTESTARGS ?= -x -vvl
.PHONY: help check
.PHONY: help
help:
@echo "Make targets:\n"
@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
################################################################################
#
# Cookies options
#
################################################################################
.PHONY: cruft-update
cruft-update:
git stash
$(PIPENV) cruft update --allow-untracked-files
################################################################################
#
# Checking and Linting
#
################################################################################
.PHONY: check cruft-check
check: cruft-check lint
cruft-check:
cruft check
$(PIPENV) cruft check
$(PIPENV) cruft diff
################################################################################
#
# Molecule logic
#
################################################################################
.PHONY: status lint converge test clean destroy
.PHONY: status lint check converge idempotence test destroy clean
status:
$(MOLECULE) list
@ -29,6 +52,9 @@ check:
converge:
$(MOLECULE) converge
idempotence:
$(MOLECULE) idempotence
test:
$(MOLECULE) test

9
roles/hashicorp_repo/meta/main.yml

@ -1,7 +1,10 @@
---
galaxy_info:
author: Justin Lecher
description: Configure HashiCorp repositories
author: "Justin Lecher"
description: "Configure HashiCorp repositories"
role_name: "hashicorp_repo"
namespace: "jlec"
license: Apache-2.0
min_ansible_version: 2.1
@ -12,7 +15,7 @@ galaxy_info:
- 20.04
- name: CentOS
versions:
- 7.8
- 7.9
galaxy_tags: []

2
roles/hashicorp_repo/molecule/default/converge.yml

@ -2,7 +2,7 @@
- name: Converge
hosts: all
collections:
- jlec.hashicorp
- "jlec.hashicorp"
tasks:
- name: "Include hashicorp_repo role"
include_role:

12
roles/hashicorp_repo/molecule/default/molecule.yml

@ -16,18 +16,6 @@ platforms:
- SYS_ADMIN
pre_build_image: true
privileged: true
- name: ansible-jlec.hashicorp.hashicorp_repo-debian
image: geerlingguy/docker-debian10-ansible
command: "/lib/systemd/systemd"
tmpfs:
- /run
- /tmp
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
capabilities:
- SYS_ADMIN
pre_build_image: true
privileged: true
- name: ansible-jlec.hashicorp.hashicorp_repo-ubuntu
image: geerlingguy/docker-ubuntu2004-ansible
command: "/lib/systemd/systemd"

2
roles/hashicorp_repo/tests/test.yml

@ -2,6 +2,6 @@
- hosts: localhost
remote_user: root
collections:
- jlec.hashicorp
- "jlec.hashicorp"
roles:
- role: "hashicorp_repo"

2
roles/nomad/.cruft.json

@ -1,6 +1,6 @@
{
"template": "git@git.ercpe.de:justin/cookiecutter-ansible-role.git",
"commit": "56f6e09c950a09b629086ddabb74d427b655f7a0",
"commit": "111c3ab58286a3e1a70addab979bd656d72dfac6",
"context": {
"cookiecutter": {
"full_name": "Justin Lecher",

12
roles/nomad/molecule/default/molecule.yml

@ -16,18 +16,6 @@ platforms:
- SYS_ADMIN
pre_build_image: true
privileged: true
- name: ansible-jlec.hashicorp.nomad-debian
image: geerlingguy/docker-debian10-ansible
command: "/lib/systemd/systemd"
tmpfs:
- /run
- /tmp
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
capabilities:
- SYS_ADMIN
pre_build_image: true
privileged: true
- name: ansible-jlec.hashicorp.nomad-ubuntu
image: geerlingguy/docker-ubuntu2004-ansible
command: "/lib/systemd/systemd"

Loading…
Cancel
Save