Define custom networks with OPACK_VAGRANT_NETWORK override
This commit is contained in:
parent
a7330ce9e7
commit
1d64683963
@ -111,7 +111,7 @@ $(OPACK_VAGRANT_FILE):
|
|||||||
|
|
||||||
opack: $(OPACK_META_FILE) $(OPACK_VAGRANT_FILE)
|
opack: $(OPACK_META_FILE) $(OPACK_VAGRANT_FILE)
|
||||||
ifndef OPACK_DEBUG
|
ifndef OPACK_DEBUG
|
||||||
$(call spinner,vagrant up > /dev/null,█ $(shell date +'%H:%M:%S') Starting $(OPACK_HOSTNAME)-$(OPACK_TARGET) with Vagrant)
|
$(call spinner,vagrant up > /dev/null,█ $(shell date +'%H:%M:%S') Starting $(OPACK_BOX_TAG) with Vagrant)
|
||||||
else
|
else
|
||||||
vagrant up
|
vagrant up
|
||||||
endif
|
endif
|
||||||
|
@ -109,6 +109,10 @@ OPACK_AUTODISKLABEL_FILE?=$(OPACK_DIR)autodisklabel
|
|||||||
# Define the Vagrantfile
|
# Define the Vagrantfile
|
||||||
OPACK_VAGRANT_FILE=Vagrantfile
|
OPACK_VAGRANT_FILE=Vagrantfile
|
||||||
|
|
||||||
|
# Define custom networks for Vagrant
|
||||||
|
OPACK_VAGRANT_NETWORK?=
|
||||||
|
#OPACK_VAGRANT_NETWORK=config.vm.network "private_network", auto_config: false
|
||||||
|
|
||||||
# Define the runtime provisioning script for Vagrant
|
# Define the runtime provisioning script for Vagrant
|
||||||
OPACK_RUNTIME_PROVISION_FILE?=$(OPACK_DIR)vagrant-provision.sh
|
OPACK_RUNTIME_PROVISION_FILE?=$(OPACK_DIR)vagrant-provision.sh
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ Vagrant.configure("2") do |config|
|
|||||||
config.ssh.sudo_command = "doas env %c"
|
config.ssh.sudo_command = "doas env %c"
|
||||||
config.vm.synced_folder ".", "/vagrant", disabled: true
|
config.vm.synced_folder ".", "/vagrant", disabled: true
|
||||||
config.vm.provision "shell", path: "$(OPACK_RUNTIME_PROVISION_FILE)"
|
config.vm.provision "shell", path: "$(OPACK_RUNTIME_PROVISION_FILE)"
|
||||||
|
$(OPACK_VAGRANT_NETWORK)
|
||||||
config.vm.provider "libvirt" do |l|
|
config.vm.provider "libvirt" do |l|
|
||||||
l.cpus = $(OPACK_SYS_CPU)
|
l.cpus = $(OPACK_SYS_CPU)
|
||||||
l.memory = $(OPACK_SYS_MEMORY)
|
l.memory = $(OPACK_SYS_MEMORY)
|
||||||
|
Loading…
Reference in New Issue
Block a user