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

---
 .drone.jsonnet                              | 2 --
 .drone.yml                                  | 4 +---
 .later.yml                                  | 7 ++++---
 molecule/centos7/molecule.yml               | 3 +++
 molecule/requirements.yml                   | 3 +++
 templates/etc/containers/registries.conf.j2 | 6 +++---
 templates/etc/sysconfig/docker.j2           | 2 +-
 7 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 molecule/requirements.yml

diff --git a/.drone.jsonnet b/.drone.jsonnet
index f87c22c..9460229 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -39,8 +39,6 @@ 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,
diff --git a/.drone.yml b/.drone.yml
index d4a7d2f..e235627 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,8 +41,6 @@ steps:
   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: 3d97504a1809878c4f70d87bf21972d1ca20f3742f6df9b9320274fd904efde9
+hmac: 793544f2400ca29c285b27151417607a13bc4f5c9474ace7c8614ac3f58fc05e
 
 ...
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/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml
index 7fc0e5b..5becb19 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:
diff --git a/molecule/requirements.yml b/molecule/requirements.yml
new file mode 100644
index 0000000..2b10ab2
--- /dev/null
+++ b/molecule/requirements.yml
@@ -0,0 +1,3 @@
+---
+collections:
+  - name: https://gitea.rknet.org/ansible/xoxys.general/releases/download/v1.1.0/xoxys-general-1.1.0.tar.gz
diff --git a/templates/etc/containers/registries.conf.j2 b/templates/etc/containers/registries.conf.j2
index 452e971..7797e29 100644
--- a/templates/etc/containers/registries.conf.j2
+++ b/templates/etc/containers/registries.conf.j2
@@ -11,12 +11,12 @@
 
 [registries.search]
 #registries = ['registry.access.redhat.com']
-registries = [{{ dockerengine_secure_registries | wrap | join(',') }}]
+registries = [{{ dockerengine_secure_registries | xoxys.general.wrap | join(',') }}]
 
 # If you need to access insecure registries, add the registry's fully-qualified name.
 # An insecure registry is one that does not have a valid SSL certificate or only does HTTP.
 [registries.insecure]
-registries = [{{ dockerengine_insecure_registries | wrap | join(',') }}]
+registries = [{{ dockerengine_insecure_registries | xoxys.general.wrap | join(',') }}]
 
 
 # If you need to block pull access from a registry, uncomment the section below
@@ -24,4 +24,4 @@ registries = [{{ dockerengine_insecure_registries | wrap | join(',') }}]
 #
 # Docker only
 [registries.block]
-registries = [{{ dockerengine_block_registries | wrap | join(',') }}]
+registries = [{{ dockerengine_block_registries | xoxys.general.wrap | join(',') }}]
diff --git a/templates/etc/sysconfig/docker.j2 b/templates/etc/sysconfig/docker.j2
index ce59b12..9439851 100644
--- a/templates/etc/sysconfig/docker.j2
+++ b/templates/etc/sysconfig/docker.j2
@@ -1,6 +1,6 @@
 {{ ansible_managed | comment }}
 # Modify these options if you want to change the way the docker daemon runs
-OPTIONS='{{ dockerengine_cli_options | prefix | join(' ') }}{{ ' --userns-remap='+dockerengine_nsremap_user+':'+dockerengine_nsremap_user if dockerengine_usernamespace_enabled | bool else '' }}'
+OPTIONS='{{ dockerengine_cli_options | xoxys.general.prefix | join(' ') }}{{ ' --userns-remap='+dockerengine_nsremap_user+':'+dockerengine_nsremap_user if dockerengine_usernamespace_enabled | bool else '' }}'
 if [ -z "${DOCKER_CERT_PATH}" ]; then
     DOCKER_CERT_PATH=/etc/docker
 fi