Moved back agent_package_url definition in default

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.1.1
+
+### Fix
+
+* Moved back fusioninventory__agent_package_url definition in default configuration
+even if it's Debian related to allow installation of a newer version than one
+available in repos or installation from private repository (for Stretch).
+
 ## v1.1.0
 
 ### Features

defaults/main.yml

@@ -13,7 +13,19 @@
 #
 fusioninventory__agent_version: '2.4-2'
                                                                    # ]]]
-
+# .. envvar:: fusioninventory__agent_package_url [[[
+#
+# The URL used to download deb package for fusioninventory-agent.
+#
+# See the official documentation for more informations :
+# http://fusioninventory.org/documentation/agent/installation/linux/deb.html
+#
+# Only works with Debian
+fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb"
+                                          if (ansible_distribution_release in
+                                              ([ "stretch" ]))
+                                          else "" }}'
+                                                                   # ]]]
 # .. envvar:: fusioninventory__agent_deploy_state [[[
 #
 # What is the desired state which this role should achieve ? Possible options :

vars/Debian.yml

@@ -1,7 +1,7 @@
 ---
 # .. vim: foldmarker=[[[,]]]:foldmethod=marker
 
-# .. envvar:: fusioninventory__agent_depend_packages [[[
+# .. envvar:: fusioninventory__agent_depend_packages
 #
 # List of dependent packages to install.
 fusioninventory__agent_depend_packages:
@@ -24,18 +24,6 @@ fusioninventory__agent_depend_packages:
   - 'libtext-template-perl'
   - 'lsb-base'
   - 'xz-utils'
-                                                                       # ]]]
+
-# .. envvar:: fusioninventory__agent_package_url [[[
-#
-# The URL used to download deb package for fusioninventory-agent.
-#
-# See the official documentation for more informations :
-# http://fusioninventory.org/documentation/agent/installation/linux/deb.html
-#
-fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb"
-                                          if (ansible_distribution_release in
-                                              ([ "stretch" ]))
-                                          else "" }}'
-                                                                   # ]]]
 fusioninventory__agent_packages:
   - 'fusioninventory-agent'

vars/RedHat.yml

@@ -1,24 +1,11 @@
 ---
 # .. vim: foldmarker=[[[,]]]:foldmethod=marker
 
-# .. envvar:: fusioninventory__agent_depend_packages [[[
+# .. envvar:: fusioninventory__agent_depend_packages
 #
 # List of dependent packages to install.
 fusioninventory__agent_depend_packages:
   - 'dmidecode'
-                                                                       # ]]]
-# .. envvar:: fusioninventory__agent_package_url [[[
-#
-# The URL used to download deb package for fusioninventory-agent.
-#
-# See the official documentation for more informations :
-# http://fusioninventory.org/documentation/agent/installation/linux/deb.html
-#
-fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb"
-                                          if (ansible_distribution_release in
-                                              ([ "stretch" ]))
-                                          else "" }}'
-                                                                   # ]]]
 
 fusioninventory__agent_packages:
   - 'fusioninventory-agent'