slapos_web_deploy: Support more distros and install whatever ansible available (1.9 or 2)...

master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.txt

@@ -40,7 +40,7 @@ fi
 
 # Warn users who aren't on an explicitly supported distro, but allow them to
 # override check and attempt installation with ``export FORCE=yes``
-if [[ ! ${DISTRO} =~ (wheezy|jessie|trusty|vivid|xenial|rhel7|rhel6|LinuxMint-17.2) ]]; then
+if [[ ! ${DISTRO} =~ (wheezy|jessie|trusty|vivid|xenial|rhel7|rhel6|LinuxMint-17.2|f20|f19|f26|artful|stretch) ]]; then
     echo "WARNING: this script has not been tested on $DISTRO"
     if [[ "$FORCE" != "yes" ]]; then
         die $LINENO "If you wish to run this script anyway run with FORCE=yes"
@@ -52,7 +52,7 @@ if [[ $DISTRO == "wheezy" ]]; then
     echo "deb http://ftp.debian.org/debian wheezy-backports main contrib " > /etc/apt/sources.list.d/wheezy-backports.list
 fi
 
-if is_fedora && [[ $DISTRO == "rhel7" ]]; then
+if is_fedora && [[ $DISTRO =~ rhel7|f20|f19 ]]; then
     # RHEL requires EPEL for many Ansible dependencies
 
     # NOTE: We always remove and install latest -- some environments
@@ -123,20 +123,8 @@ EOF
 fi
 
 is_package_installed openssl || install_package openssl
-# stick to a specific ansible package version
-if is_ubuntu; then
-  # is_ubuntu also handle debian distro
-  is_package_installed ansible || install_package ansible=1.*
-elif is_fedora; then
-  # is_fedora also handle CentOS distro
-  if [[ "$os_VENDOR" =~ (CentOS) ]] ; then
-    is_package_installed ansible || install_package ansible
-  else
-    is_package_installed ansible || install_package ansible1.9.noarch
-  fi
-else
-  is_package_installed ansible || install_package ansible
-fi
+is_package_installed ansible || install_package ansible
+
 is_package_installed python-setuptools || install_package python-setuptools
 
 if is_ubuntu && [[ $DISTRO == "trusty" ]]; then

master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.xml

@@ -237,7 +237,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>955.9190.35092.39833</string> </value>
+                <value> <string>961.29395.5252.38758</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -255,7 +255,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1478606319.62</float>
+                        <float>1512479078.93</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

[Rafael Monnerat]

@luke, double check if this is ok for your change too. (it was applied on master already)

[Łukasz Nowak]

@rafael I can't check, as I do not have instance running, I made this fix on FS.

[Rafael Monnerat]

ok, so we see if don't break when you run it

[Łukasz Nowak]

It's directly covered by SLAPOS-DEPLOY% tests.

[Łukasz Nowak]

When I download https://deploy.erp5.net/erp5-standalone it still delivers old version. Is it cached somehow?