feat: add option to add custom unit override options
This commit is contained in:
parent
0f881e669b
commit
7fc0fdce9b
@ -41,7 +41,7 @@ local PipelineLinting = {
|
||||
},
|
||||
};
|
||||
|
||||
local PipelineDeployment(scenario='centos7') = {
|
||||
local PipelineDeployment(scenario='rocky9') = {
|
||||
kind: 'pipeline',
|
||||
name: 'testing-' + scenario,
|
||||
platform: {
|
||||
@ -115,7 +115,7 @@ local PipelineDocumentation = {
|
||||
ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
|
||||
},
|
||||
depends_on: [
|
||||
'testing-centos7',
|
||||
'testing-rocky9',
|
||||
],
|
||||
};
|
||||
|
||||
@ -153,7 +153,7 @@ local PipelineNotification = {
|
||||
|
||||
[
|
||||
PipelineLinting,
|
||||
PipelineDeployment(scenario='centos7'),
|
||||
PipelineDeployment(scenario='rocky9'),
|
||||
PipelineDocumentation,
|
||||
PipelineNotification,
|
||||
]
|
||||
|
@ -36,7 +36,7 @@ trigger:
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
name: testing-centos7
|
||||
name: testing-rocky9
|
||||
|
||||
platform:
|
||||
os: linux
|
||||
@ -53,7 +53,7 @@ steps:
|
||||
- name: ansible-molecule
|
||||
image: thegeeklab/molecule:4
|
||||
commands:
|
||||
- molecule test -s centos7
|
||||
- molecule test -s rocky9
|
||||
environment:
|
||||
HCLOUD_TOKEN:
|
||||
from_secret: hcloud_token
|
||||
@ -107,7 +107,7 @@ trigger:
|
||||
- refs/pull/**
|
||||
|
||||
depends_on:
|
||||
- testing-centos7
|
||||
- testing-rocky9
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
@ -147,6 +147,6 @@ depends_on:
|
||||
|
||||
---
|
||||
kind: signature
|
||||
hmac: 07e123ae54fb79836d48b0fee57666759de62d8e85a94d9386179e636b2235e3
|
||||
hmac: 9937973aed8a030a7c7d74909473f0424bea63aad70049727a2925b10d00aac2
|
||||
|
||||
...
|
||||
|
@ -13,11 +13,12 @@ dockerengine_packages:
|
||||
dockerengine_packages_extra: []
|
||||
|
||||
docker_ansible_deps:
|
||||
- cryptography~=2.0
|
||||
- docker-compose~=1.24.0
|
||||
- cryptography
|
||||
- docker-compose
|
||||
- docker
|
||||
|
||||
dockerengine_service: docker
|
||||
dockerengine_service_override_unit: []
|
||||
|
||||
dockerengine_docker_group_enabled: False
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
vars:
|
||||
dockerengine_packages_extra:
|
||||
- epel-release
|
||||
- python-pip
|
||||
- python-virtualenv
|
||||
- python3-pip
|
||||
- python3-virtualenv
|
||||
|
||||
roles:
|
||||
- role: xoxys.docker_engine
|
@ -20,7 +20,7 @@
|
||||
pip:
|
||||
name: "{{ item }}"
|
||||
virtualenv: /opt/python2/ansible-deps
|
||||
loop: "{{ docker_ansible_deps }}"
|
||||
loop: "{{ dockerengine_ansible_deps }}"
|
||||
|
||||
- name: Add docker-compose wrapper
|
||||
template:
|
||||
|
@ -1,3 +1,4 @@
|
||||
#jinja2: lstrip_blocks: True
|
||||
{{ ansible_managed | comment }}
|
||||
OPTIONS='{{'--userns-remap=' + dockerengine_nsremap_user + ':' + dockerengine_nsremap_user if dockerengine_usernamespace_enabled | bool else '' }}'
|
||||
|
||||
|
@ -1,3 +1,10 @@
|
||||
#jinja2: lstrip_blocks: True
|
||||
{{ ansible_managed | comment }}
|
||||
{% if dockerengine_service_override_unit | default([]) | length > 0 %}
|
||||
[Unit]
|
||||
{% for item in dockerengine_service_override_unit %}
|
||||
{{ item }}
|
||||
{% endfor %}
|
||||
[Service]
|
||||
EnvironmentFile=-/etc/sysconfig/docker
|
||||
ExecStart=
|
||||
|
Loading…
Reference in New Issue
Block a user