Merge branch 'release/20210502.1.0'

alvistack · May 2, 2021 · c9317ce · c9317ce
2 parents 97250d4 + 288a74b
commit c9317ce
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 34 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -20,9 +20,9 @@
 .script-bootstrap-vagrant: &script-bootstrap-vagrant
   - |
     if ! [[ -x "$(command -v vagrant)" ]]; then
-      curl -skL -O https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.deb
-      sudo dpkg -i vagrant_2.2.15_x86_64.deb
-      rm -rf vagrant_2.2.15_*
+      curl -skL -O https://releases.hashicorp.com/vagrant/2.2.16/vagrant_2.2.16_x86_64.deb
+      sudo dpkg -i vagrant_2.2.16_x86_64.deb
+      rm -rf vagrant_2.2.16_*
     fi
     sh -x -c "vagrant --version"
     vagrant cloud auth login --token $VAGRANT_CLOUD_TOKEN

diff --git a/playbooks/prepare.yml b/playbooks/prepare.yml
@@ -133,3 +133,9 @@
       when: ansible_os_family | lower == "suse"
       changed_when: false
       ignore_errors: true
+
+    - name: reboot
+      reboot:
+        reboot_timeout: 300
+      register: result
+      until: result is succeeded
diff --git a/playbooks/tasks/debian.yml b/playbooks/tasks/debian.yml
@@ -60,12 +60,6 @@
   changed_when: false
   ignore_errors: true
 
-- name: reboot
-  reboot:
-    reboot_timeout: 300
-  register: result
-  until: result is succeeded
-
 - name: apt-get install qemu-guest-agent
   apt:
     name: "{{ item.name }}"

diff --git a/playbooks/tasks/redhat.yml b/playbooks/tasks/redhat.yml
@@ -51,12 +51,6 @@
   changed_when: false
   ignore_errors: true
 
-- name: reboot
-  reboot:
-    reboot_timeout: 300
-  register: result
-  until: result is succeeded
-
 - name: yum install qemu-guest-agent
   yum:
     name: "{{ item.name }}"

diff --git a/playbooks/tasks/suse.yml b/playbooks/tasks/suse.yml
@@ -68,12 +68,6 @@
   changed_when: false
   ignore_errors: true
 
-- name: reboot
-  reboot:
-    reboot_timeout: 300
-  register: result
-  until: result is succeeded
-
 - name: zypper install qemu-guest-agent
   zypper:
     name: "{{ item.name }}"

diff --git a/roles/locales b/roles/locales
diff --git a/roles/python b/roles/python
diff --git a/roles/sshd b/roles/sshd
diff --git a/roles/timezone b/roles/timezone
diff --git a/scripts/bootstrap-vagrant.sh b/scripts/bootstrap-vagrant.sh
@@ -22,27 +22,27 @@ cd "$(cd "$(dirname "$0")"; pwd -P)/../"
 if [ -x "$(command -v apt-get)" ]; then
     apt-get update
     apt-get install -y binutils bridge-utils dnsmasq-base ebtables gcc libguestfs-tools libvirt-clients libvirt-daemon-system libvirt-dev make qemu-system qemu-utils ruby-dev
-    curl -skL -O https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.deb
-    dpkg -i vagrant_2.2.15_x86_64.deb
-    rm -rf vagrant_2.2.15_*
+    curl -skL -O https://releases.hashicorp.com/vagrant/2.2.16/vagrant_2.2.16_x86_64.deb
+    dpkg -i vagrant_2.2.16_x86_64.deb
+    rm -rf vagrant_2.2.16_*
 fi
 
 # Prepare YUM dependencies
 if [ -x "$(command -v yum)" ]; then
     yum makecache
     yum install -y binutils dnsmasq ebtables gcc libguestfs-tools-c libvirt libvirt-client libvirt-devel make qemu-img qemu-kvm ruby-devel virt-install
-    curl -skL -O https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.rpm
-    yum localinstall vagrant_2.2.15_x86_64.rpm
-    rm -rf vagrant_2.2.15_*
+    curl -skL -O https://releases.hashicorp.com/vagrant/2.2.16/vagrant_2.2.16_x86_64.rpm
+    yum localinstall vagrant_2.2.16_x86_64.rpm
+    rm -rf vagrant_2.2.16_*
 fi
 
 # Prepare Zypper dependencies
 if [ -x "$(command -v zypper)" ]; then
     zypper -n --gpg-auto-import-keys refresh
     zypper -n install -y binutils-gold bridge-utils dnsmasq ebtables gcc guestfs-tools libvirt libvirt-client libvirt-devel make qemu-kvm qemu-tools ruby-devel virt-install
-    curl -skL -O https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.rpm
-    zypper install vagrant_2.2.15_x86_64.rpm
-    rm -rf vagrant_2.2.15_*
+    curl -skL -O https://releases.hashicorp.com/vagrant/2.2.16/vagrant_2.2.16_x86_64.rpm
+    zypper install vagrant_2.2.16_x86_64.rpm
+    rm -rf vagrant_2.2.16_*
 fi
 
 # Install vagrant-libvirt