Infra/rougail
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove override and rougail.conf from template.py

Browse Source
This commit is contained in:
Emmanuel Garette
2020-07-08 16:20:06 +02:00
parent b021460b94
commit 8c5a9f2cd3
23 changed files with 151 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/flattener_dicos/20override/00-base.xml
View File

@ -3,7 +3,7 @@
<services>
<service name="test">
<override name="test.service"/>
<override/>
</service>
</services>

2
tests/flattener_dicos/20override/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": "non", "services.test.overrides.test_service.name": "test.service", "services.test.overrides.test_service.source": "test.service", "services.test.overrides.test_service.templating": true, "services.test.overrides.test_service.activate": true}
{"rougail.general.mode_conteneur_actif": "non", "services.test.overrides.test_service.group": "root", "services.test.overrides.test_service.mode": "0644", "services.test.overrides.test_service.name": "/systemd/system/test.service.d/rougail.conf", "services.test.overrides.test_service.owner": "root", "services.test.overrides.test_service.source": "test.service", "services.test.overrides.test_service.templating": true, "services.test.overrides.test_service.activate": true}

11
tests/flattener_dicos/20override/result/00-base.xml
View File

@ -5,8 +5,17 @@
<family doc="test" name="test">
<family name="overrides" doc="overrides">
<family doc="test.service" name="test_service">
<variable doc="group" multi="False" name="group" type="string">
<value>root</value>
</variable>
<variable doc="mode" multi="False" name="mode" type="string">
<value>0644</value>
</variable>
<variable doc="name" multi="False" name="name" type="string">
<value>test.service</value>
<value>/systemd/system/test.service.d/rougail.conf</value>
</variable>
<variable doc="owner" multi="False" name="owner" type="string">
<value>root</value>
</variable>
<variable doc="source" multi="False" name="source" type="string">
<value>test.service</value>

1
tests/flattener_dicos/70container_files/00-base.xml
View File

@ -5,6 +5,7 @@
<services>
<service name='test'>
<file name='/etc/mailname'/>
<file name='/rougail.conf'/>
</service>
</services>

2
tests/flattener_dicos/70container_files/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname.group": "root", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.templating": true, "services.test.files.mailname.activate": true}
{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname.group": "root", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.templating": true, "services.test.files.mailname.activate": true, "services.test.files.rougail_conf.group": "root", "services.test.files.rougail_conf.mode": "0644", "services.test.files.rougail_conf.name": "/rougail.conf", "services.test.files.rougail_conf.owner": "root", "services.test.files.rougail_conf.source": "rougail.conf", "services.test.files.rougail_conf.templating": true, "services.test.files.rougail_conf.activate": true}

23
tests/flattener_dicos/70container_files/result/00-base.xml
View File

@ -27,6 +27,29 @@
<value>True</value>
</variable>
</family>
<family doc="rougail.conf" name="rougail_conf">
<variable doc="group" multi="False" name="group" type="string">
<value>root</value>
</variable>
<variable doc="mode" multi="False" name="mode" type="string">
<value>0644</value>
</variable>
<variable doc="name" multi="False" name="name" type="string">
<value>/rougail.conf</value>
</variable>
<variable doc="owner" multi="False" name="owner" type="string">
<value>root</value>
</variable>
<variable doc="source" multi="False" name="source" type="string">
<value>rougail.conf</value>
</variable>
<variable doc="templating" multi="False" name="templating" type="boolean">
<value>True</value>
</variable>
<variable doc="activate" multi="False" name="activate" type="boolean">
<value>True</value>
</variable>
</family>
</family>
</family>
</family>