#1071 Two minor fixes to Vagrantfile
Merged 8 months ago by mprahl. Opened 8 months ago by cqi.
cqi/fm-orchestrator fix-vagrant  into  master

file modified
+4 -4

@@ -48,9 +48,9 @@ 

          wget \

          which

  

-     if [ ! -e /etc/module-build-service ]; then

-         ln -s /opt/module_build_service/conf /etc/module-build-service

-     fi

+     mbs_config_dir=/etc/module-build-service

+     [ -e "$mbs_config_dir" ] || mkdir "$mbs_config_dir"

+     cp -r /opt/module_build_service/conf/* "$mbs_config_dir"

  SCRIPT

  

  $make_devenv = <<DEVENV

@@ -98,7 +98,7 @@ 

    config.vm.network "forwarded_port", guest_ip: "0.0.0.0", guest: 5000, host: 5000

    config.vm.network "forwarded_port", guest_ip: "0.0.0.0", guest: 13747, host: 13747

    config.vm.provision "shell", inline: $script

-   config.vm.provision "shell", inline: "usermod -a -G mock Vagrant"

+   config.vm.provision "shell", inline: "usermod -a -G mock vagrant"

    config.vm.provision "shell", inline: $make_devenv, privileged: false

    config.vm.provision "shell", inline: $script_services, privileged: false, run: "always"

    config.vm.provider "libvirt" do |v, override|

  • Fix incorrect username appended to mock group
  • Make directory /etc/module-build-service instead of link. This is helpful for installing rhpkg to to run MBS with internal infra.

Pull-Request has been merged by mprahl

8 months ago