Merge branch 'master' into service-cron
This commit is contained in:
commit
5f3078572c
|
@ -3,6 +3,7 @@
|
||||||
### Enhancement
|
### Enhancement
|
||||||
* Upgrade package version from URL from 2.4 to 2.6 (thanks to @roumano - issue #15).
|
* Upgrade package version from URL from 2.4 to 2.6 (thanks to @roumano - issue #15).
|
||||||
* Allow running the agent with a cron job instead of the service (thanks to @yodabzh - issue #18)
|
* Allow running the agent with a cron job instead of the service (thanks to @yodabzh - issue #18)
|
||||||
|
* Allow service to be managed, (thanks to @yodabzh - issue #17).
|
||||||
|
|
||||||
### Fix
|
### Fix
|
||||||
* Switch to Github URL to download deb file (thanks to @roumano - PR #16).
|
* Switch to Github URL to download deb file (thanks to @roumano - PR #16).
|
||||||
|
|
|
@ -24,6 +24,8 @@ A role to manage FusionInventory agent installation and configuration.
|
||||||
* **fusioninventory__agent_service_name** : The service name to manage [default : `fusioninventory-agent`].
|
* **fusioninventory__agent_service_name** : The service name to manage [default : `fusioninventory-agent`].
|
||||||
* **fusioninventory__agent_service_manage** : If the fusioninventory agent service should be managed [default : `true`].
|
* **fusioninventory__agent_service_manage** : If the fusioninventory agent service should be managed [default : `true`].
|
||||||
* **fusioninventory__agent_conf_src** : Template used to provide agent configuration file [default : `../templates/etc/fusioninventory/agent.cfg.j2`].
|
* **fusioninventory__agent_conf_src** : Template used to provide agent configuration file [default : `../templates/etc/fusioninventory/agent.cfg.j2`].
|
||||||
|
* **fusioninventory__agent_service_status**: Service state, can be started, stopped, restarted, reloaded [default : `started`].
|
||||||
|
* **fusioninventory__agent_service_enabled**: Service status, can be enabled (`true`) or disabled (`false`) [default: `true`].
|
||||||
|
|
||||||
## Cron variables
|
## Cron variables
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,19 @@ fusioninventory__agent_deploy_state: 'present'
|
||||||
# The service name to manage.
|
# The service name to manage.
|
||||||
#
|
#
|
||||||
fusioninventory__agent_service_name: 'fusioninventory-agent'
|
fusioninventory__agent_service_name: 'fusioninventory-agent'
|
||||||
|
# ]]]
|
||||||
|
# .. envvar:: fusioninventory__agent_service_status [[[
|
||||||
|
#
|
||||||
|
# The targeted service status.
|
||||||
|
#
|
||||||
|
fusioninventory__agent_service_status: 'started'
|
||||||
|
# ]]]
|
||||||
|
|
||||||
|
# .. envvar:: fusioninventory__agent_service_enabled [[[
|
||||||
|
#
|
||||||
|
# The targeted service status.
|
||||||
|
#
|
||||||
|
fusioninventory__agent_service_enabled: true
|
||||||
|
|
||||||
# ]]]
|
# ]]]
|
||||||
# .. envvar:: fusioninventory__agent_service_manage [[[
|
# .. envvar:: fusioninventory__agent_service_manage [[[
|
||||||
|
|
|
@ -57,6 +57,12 @@
|
||||||
when: fusioninventory__agent_deploy_state == "present"
|
when: fusioninventory__agent_deploy_state == "present"
|
||||||
notify: ['restart fusioninventory-agent service']
|
notify: ['restart fusioninventory-agent service']
|
||||||
|
|
||||||
|
- name: Ensure the service is in the correct state
|
||||||
|
service:
|
||||||
|
name: "{{ fusioninventory__agent_service_name }}"
|
||||||
|
state: "{{ fusioninventory__agent_service_status }}"
|
||||||
|
enabled: "{{ fusioninventory__agent_service_enabled }}"
|
||||||
|
when: fusioninventory__agent_deploy_state == "present"
|
||||||
|
|
||||||
- name: "Create cron entry when needed"
|
- name: "Create cron entry when needed"
|
||||||
cron:
|
cron:
|
||||||
|
@ -70,3 +76,4 @@
|
||||||
user: "{{ fusioninventory__agent_conf_cron_user }}"
|
user: "{{ fusioninventory__agent_conf_cron_user }}"
|
||||||
state: "{{ fusioninventory__agent_conf_cron }}"
|
state: "{{ fusioninventory__agent_conf_cron }}"
|
||||||
job: "{{ fusioninventory__agent_conf_command }}"
|
job: "{{ fusioninventory__agent_conf_command }}"
|
||||||
|
|
||||||
|
|
Reference in New Issue