From acfc79fdbc52553d62d85632d06134d5596e64e7 Mon Sep 17 00:00:00 2001
From: Michal Konečný <mkonecny@redhat.com>
Date: Nov 19 2019 13:55:08 +0000
Subject: Upgrade Vagrant to F30


Signed-off-by: Michal Konečný <mkonecny@redhat.com>

---

diff --git a/dev/Vagrantfile.example b/dev/Vagrantfile.example
index 0cf3fd6..f132f75 100644
--- a/dev/Vagrantfile.example
+++ b/dev/Vagrantfile.example
@@ -4,8 +4,8 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/28/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-28-1.1.x86_64.vagrant-libvirt.box"
- config.vm.box = "f28-cloud-libvirt"
+ config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-30-1.2.x86_64.vagrant-libvirt.box"
+ config.vm.box = "f30-cloud-libvirt"
 
 
  # Forward traffic on the host to the development server on the guest
@@ -27,8 +27,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  # config.vm.synced_folder ".", "/vagrant", type: "nfs", nfs_version: 4, nfs_udp: false
  config.vm.synced_folder ".", "/vagrant", disabled: true
  config.vm.synced_folder ".", "/home/vagrant/devel",
-     type: "sshfs",
-     sshfs_opts_append: "-o nonempty"
+     type: "sshfs"
 
  # To cache update packages (which is helpful if frequently doing `vagrant destroy && vagrant up`)
  # you can create a local directory and share it to the guest's DNF cache. The directory needs to
diff --git a/dev/ansible/roles/pagure-dev/tasks/main.yml b/dev/ansible/roles/pagure-dev/tasks/main.yml
index 072f49a..b611751 100644
--- a/dev/ansible/roles/pagure-dev/tasks/main.yml
+++ b/dev/ansible/roles/pagure-dev/tasks/main.yml
@@ -34,7 +34,6 @@
       - python3-chardet
       - python3-cryptography
       - python3-docutils
-      - python3-enum34
       - python3-eventlet
       - python3-fedora-flask
       - python3-flask
@@ -93,7 +92,7 @@
       - "pygit2=={{ libgit2_version.stdout_lines[0] }}.*"
     virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/python3-pagure/
     virtualenv_python: python3
-    virtualenv_command: virtualenv-3
+    virtualenv_command: virtualenv
 
 # Install Pagure inside a virtualenv and configure it for python3
 - name: Install pygit2 in the python3 virtualenv
@@ -109,7 +108,7 @@
   pip:
     requirements: /home/{{ ansible_env.SUDO_USER }}/devel/{{ item }}
     virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/python3-pagure/
-    virtualenv_command: virtualenv-3
+    virtualenv_command: virtualenv
   with_items:
     - "requirements.txt"
     - "requirements-ev.txt"
@@ -132,7 +131,7 @@
     name: /home/{{ ansible_env.SUDO_USER }}/devel/
     extra_args: '-e'
     virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/python3-pagure/
-    virtualenv_command: virtualenv-3
+    virtualenv_command: virtualenv
 
 - name: Install Pagure package into /usr/lib
   pip: