From f6e41244c3b3ef31b8b9008d382d3eb22a0ea350 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Wed, 19 Aug 2020 18:39:04 +0200
Subject: [PATCH] migrate dependencies to collections

---
 .drone.jsonnet                |  4 +---
 .drone.yml                    |  6 ++----
 .later.yml                    |  7 ++++---
 meta/main.yml                 | 18 ++++++++++--------
 molecule/centos7/molecule.yml |  5 ++++-
 molecule/requirements.yml     |  5 +++++
 6 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 molecule/requirements.yml

diff --git a/.drone.jsonnet b/.drone.jsonnet
index f87c22c..eb8a217 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -39,11 +39,9 @@ local PipelineDeployment(scenario='centos7') = {
       image: 'xoxys/molecule:3',
       environment: {
         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: [
-        'molecule test -s' + scenario,
+        'molecule test -s ' + scenario,
       ],
     },
   ],
diff --git a/.drone.yml b/.drone.yml
index e1743ac..97c8d89 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -37,12 +37,10 @@ steps:
 - name: ansible-molecule
   image: xoxys/molecule:3
   commands:
-  - molecule test -scentos7
+  - molecule test -s centos7
   environment:
     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:
   ref:
@@ -146,6 +144,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 5b913352027ab05fd63656f2b3997a48ff8095ff03b746d25d105da6b5c5c9ff
+hmac: ba4d8097153b6e5ec7db5f78f00e36650bfe22c91c4cc5e00bcad809cfce4a9a
 
 ...
diff --git a/.later.yml b/.later.yml
index 45911c9..0efe5d5 100644
--- a/.later.yml
+++ b/.later.yml
@@ -3,9 +3,10 @@ ansible:
   custom_modules:
     - iptables_raw
     - openssl_pkcs12
-    - proxmox_kvm2
+    - proxmox_kvm
     - ucr
-    - yum_versionlock
+    - corenetworks_dns
+    - corenetworks_token
 
 rules:
   exclude_files:
@@ -13,6 +14,6 @@ rules:
     - "LICENSE*"
     - "**/*.md"
     - "**/*.ini"
-  
+
   exclude_filter:
     - LINT0009
diff --git a/meta/main.yml b/meta/main.yml
index 0ba30b0..ddf0963 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,15 +1,15 @@
 # Standards: 0.1
 ---
 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>
-# @meta description: >
-# [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.sshd)
-# [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.sshd?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.sshd)
-# [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.sshd/src/branch/master/LICENSE)
-#
-# Configure sshd server.
-# @end
+  # @meta description: >
+  # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.sshd)
+  # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.sshd?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.sshd)
+  # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.sshd/src/branch/master/LICENSE)
+  #
+  # Configure sshd server.
+  # @end
   description: Configure sshd server
   license: MIT
   min_ansible_version: 2.8
@@ -21,3 +21,5 @@ galaxy_info:
     - sshd
     - security
 dependencies: []
+collections:
+  - community.general
diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml
index d08651e..572d41c 100644
--- a/molecule/centos7/molecule.yml
+++ b/molecule/centos7/molecule.yml
@@ -1,6 +1,9 @@
 ---
 dependency:
   name: galaxy
+  options:
+    role-file: molecule/requirements.yml
+    requirements-file: molecule/requirements.yml
 driver:
   name: delegated
 platforms:
@@ -9,7 +12,7 @@ platforms:
     image_id: centos-7-x64
     size_id: s-1vcpu-1gb
 lint: |
-  flake8
+  /usr/local/bin/flake8
 provisioner:
   name: ansible
   env:
diff --git a/molecule/requirements.yml b/molecule/requirements.yml
new file mode 100644
index 0000000..70797d2
--- /dev/null
+++ b/molecule/requirements.yml
@@ -0,0 +1,5 @@
+---
+collections:
+  - name: https://gitea.rknet.org/ansible/xoxys.general/releases/download/v1.1.0/xoxys-general-1.1.0.tar.gz
+
+  - name: community.general