migrate dependencies to collections
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Robert Kaussow 2020-08-19 18:39:06 +02:00
parent 20c5a8a77c
commit c347a0d711
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
8 changed files with 38 additions and 32 deletions

View File

@ -39,11 +39,9 @@ local PipelineDeployment(scenario='centos7') = {
image: 'xoxys/molecule:3', image: 'xoxys/molecule:3',
environment: { environment: {
DO_API_KEY: { from_secret: 'do_api_key' }, DO_API_KEY: { from_secret: 'do_api_key' },
MOLECULE_CUSTOM_MODULES_REPO: 'https://gitea.rknet.org/ansible/custom_modules',
MOLECULE_CUSTOM_FILTERS_REPO: 'https://gitea.rknet.org/ansible/custom_filters',
}, },
commands: [ commands: [
'molecule test -s' + scenario, 'molecule test -s ' + scenario,
], ],
}, },
], ],

View File

@ -37,12 +37,10 @@ steps:
- name: ansible-molecule - name: ansible-molecule
image: xoxys/molecule:3 image: xoxys/molecule:3
commands: commands:
- molecule test -scentos7 - molecule test -s centos7
environment: environment:
DO_API_KEY: DO_API_KEY:
from_secret: do_api_key from_secret: do_api_key
MOLECULE_CUSTOM_FILTERS_REPO: https://gitea.rknet.org/ansible/custom_filters
MOLECULE_CUSTOM_MODULES_REPO: https://gitea.rknet.org/ansible/custom_modules
trigger: trigger:
ref: ref:
@ -146,6 +144,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: c0340a399cac04f59310a7c888ad60ccfd8aa8a2b742c8eafac01c38237c7878 hmac: 71a2d2321b3783336bef59723e254c6ec405d5144fb40291bba5eb70ed631792
... ...

View File

@ -3,9 +3,10 @@ ansible:
custom_modules: custom_modules:
- iptables_raw - iptables_raw
- openssl_pkcs12 - openssl_pkcs12
- proxmox_kvm2 - proxmox_kvm
- ucr - ucr
- yum_versionlock - corenetworks_dns
- corenetworks_token
rules: rules:
exclude_files: exclude_files:
@ -13,6 +14,6 @@ rules:
- "LICENSE*" - "LICENSE*"
- "**/*.md" - "**/*.md"
- "**/*.ini" - "**/*.ini"
exclude_filter: exclude_filter:
- LINT0009 - LINT0009

View File

@ -1,16 +1,16 @@
# Standards: 0.1 # Standards: 0.1
--- ---
galaxy_info: galaxy_info:
# @meta author:value: [Robert Kaussow](https://gitea.rknet.org/xoxys) # @meta author:value: [Robert Kaussow](https://gitea.rknet.org/xoxys)
author: Robert Kaussow <mail@geeklabor.de> author: Robert Kaussow <mail@geeklabor.de>
# @meta description: > # @meta description: >
# [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.bitwardenrs_docker) # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.bitwardenrs_docker)
# [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.bitwardenrs_docker?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.bitwardenrs_docker) # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.bitwardenrs_docker?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.bitwardenrs_docker)
# [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.bitwardenrs_docker/src/branch/master/LICENSE) # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.bitwardenrs_docker/src/branch/master/LICENSE)
# #
# Role to setup a [Bitwarden RS](https://github.com/dani-garcia/bitwarden_rs) password safe. # Role to setup a [Bitwarden RS](https://github.com/dani-garcia/bitwarden_rs) password safe.
# Bitwarden_RS is a community Bitwarden API server implementation written in Rust. # Bitwarden_RS is a community Bitwarden API server implementation written in Rust.
# @end # @end
description: Role to setup Bitwarden passsword safe description: Role to setup Bitwarden passsword safe
license: MIT license: MIT
min_ansible_version: 2.8 min_ansible_version: 2.8
@ -24,3 +24,5 @@ galaxy_info:
- password - password
- save - save
dependencies: [] dependencies: []
collections:
- community.general

View File

@ -1,6 +1,9 @@
--- ---
dependency: dependency:
name: galaxy name: galaxy
options:
role-file: molecule/requirements.yml
requirements-file: molecule/requirements.yml
driver: driver:
name: delegated name: delegated
platforms: platforms:
@ -9,7 +12,7 @@ platforms:
image_id: centos-7-x64 image_id: centos-7-x64
size_id: s-1vcpu-1gb size_id: s-1vcpu-1gb
lint: | lint: |
flake8 /usr/local/bin/flake8
provisioner: provisioner:
name: ansible name: ansible
env: env:

View File

@ -1,10 +0,0 @@
---
- src: https://gitea.rknet.org/ansible/xoxys.docker_engine.git
name: xoxys.docker_engine
scm: git
version: master
- src: https://gitea.rknet.org/ansible/xoxys.postgres.git
name: xoxys.postgres
scm: git
version: master

16
molecule/requirements.yml Normal file
View File

@ -0,0 +1,16 @@
---
collections:
- name: https://gitea.rknet.org/ansible/xoxys.general/releases/download/v1.1.0/xoxys-general-1.1.0.tar.gz
- name: community.general
roles:
- src: https://gitea.rknet.org/ansible/xoxys.docker_engine.git
name: xoxys.docker_engine
scm: git
version: master
- src: https://gitea.rknet.org/ansible/xoxys.postgres.git
name: xoxys.postgres
scm: git
version: master

View File

@ -22,7 +22,5 @@
remove_orphans: yes remove_orphans: yes
stopped: "{{ bitwardenrs_service_stopped }}" stopped: "{{ bitwardenrs_service_stopped }}"
state: present state: present
# temp. disable changes; breaks idempotency for whatever reason
changed_when: False
become: True become: True
become_user: root become_user: root