migrate dependencies to collections
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Robert Kaussow 2020-08-19 16:17:08 +02:00
parent 7ad53e56eb
commit f6df4af2eb
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
7 changed files with 15 additions and 12 deletions

View File

@ -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,

View File

@ -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
...

View File

@ -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:

View File

@ -1,6 +1,9 @@
---
dependency:
name: galaxy
options:
role-file: molecule/requirements.yml
requirements-file: molecule/requirements.yml
driver:
name: delegated
platforms:

View File

@ -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

View File

@ -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(',') }}]

View File

@ -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