#4661 Upgrade Vagrant to F30
Merged 4 years ago by pingou. Opened 4 years ago by zlopez.
zlopez/pagure vagrant-f30  into  master

file modified
+3 -4
@@ -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 @@ 

   # 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"

Any reason to remove this option?

Reading https://bbs.archlinux.org/viewtopic.php?id=228225 it seems it's not only no longer needed but potentially annoying :thumbsup: to drop it! :)

+      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

@@ -34,7 +34,6 @@ 

        - python3-chardet

        - python3-cryptography

        - python3-docutils

-       - python3-enum34

enum34 removal ?

        - 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:

Per irc conversations I expected some changes on the ansible role too, removing enum34 at least :)

Per irc conversations I expected some changes on the ansible role too, removing enum34 at least :)

It is in dev/ansible/roles/pagure-dev/tasks/main.yml :-)

omg, I bypassed it :D wfm

enum34 removal ?

After irc conversation with @jlanda and @pingou I removed this package, because it is no longer available in F30 and not needed anymore.

Any reason to remove this option?

Reading https://bbs.archlinux.org/viewtopic.php?id=228225 it seems it's not only no longer needed but potentially annoying :thumbsup: to drop it! :)

Alright, let's get this in :)

Pull-Request has been merged by pingou

4 years ago