From 712017f96da93e620fc938a2b20e6eb3fd28fcab Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Sat, 26 Jan 2019 14:24:05 +0100 Subject: [PATCH] Cleanup and run on Mac. --- .../fedora29/libvirt/action_provision | 1 - .../machines/fedora29/libvirt/creator_uid | 1 - .vagrant/machines/fedora29/libvirt/id | 1 - .vagrant/machines/fedora29/libvirt/index_uuid | 1 - .../machines/fedora29/libvirt/private_key | 27 ------------------- .../machines/fedora29/libvirt/synced_folders | 1 - .../machines/fedora29/libvirt/vagrant_cwd | 1 - README.md | 19 +++++++++++++ Vagrantfile | 11 +------- Vagrantfile.libvirt | 10 +++++++ Vagrantfile.virtualbox | 13 +++++++++ 11 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 .vagrant/machines/fedora29/libvirt/action_provision delete mode 100644 .vagrant/machines/fedora29/libvirt/creator_uid delete mode 100644 .vagrant/machines/fedora29/libvirt/id delete mode 100644 .vagrant/machines/fedora29/libvirt/index_uuid delete mode 100644 .vagrant/machines/fedora29/libvirt/private_key delete mode 100644 .vagrant/machines/fedora29/libvirt/synced_folders delete mode 100644 .vagrant/machines/fedora29/libvirt/vagrant_cwd mode change 100644 => 120000 Vagrantfile create mode 100644 Vagrantfile.libvirt create mode 100644 Vagrantfile.virtualbox diff --git a/.vagrant/machines/fedora29/libvirt/action_provision b/.vagrant/machines/fedora29/libvirt/action_provision deleted file mode 100644 index c094ad3..0000000 --- a/.vagrant/machines/fedora29/libvirt/action_provision +++ /dev/null @@ -1 +0,0 @@ -1.5:49e82318-88e2-4fa3-9c6a-5c3a5a4183a2 \ No newline at end of file diff --git a/.vagrant/machines/fedora29/libvirt/creator_uid b/.vagrant/machines/fedora29/libvirt/creator_uid deleted file mode 100644 index e37d32a..0000000 --- a/.vagrant/machines/fedora29/libvirt/creator_uid +++ /dev/null @@ -1 +0,0 @@ -1000 \ No newline at end of file diff --git a/.vagrant/machines/fedora29/libvirt/id b/.vagrant/machines/fedora29/libvirt/id deleted file mode 100644 index a554278..0000000 --- a/.vagrant/machines/fedora29/libvirt/id +++ /dev/null @@ -1 +0,0 @@ -49e82318-88e2-4fa3-9c6a-5c3a5a4183a2 \ No newline at end of file diff --git a/.vagrant/machines/fedora29/libvirt/index_uuid b/.vagrant/machines/fedora29/libvirt/index_uuid deleted file mode 100644 index 7cab89e..0000000 --- a/.vagrant/machines/fedora29/libvirt/index_uuid +++ /dev/null @@ -1 +0,0 @@ -1d3ed013c0f54f5ea1aa9619bcfd4ea9 \ No newline at end of file diff --git a/.vagrant/machines/fedora29/libvirt/private_key b/.vagrant/machines/fedora29/libvirt/private_key deleted file mode 100644 index d58e387..0000000 --- a/.vagrant/machines/fedora29/libvirt/private_key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA03Sj1kb4IY2/xqaosJ4lmtBGR1RQSSpTsz/QciPuRzA8usLJ -p1/66/BO/DuZoGjoKFwS7T6yVNm5xNWiEYUlNgfW1U4U6jguo7DFjZ6Rg6w1vKfh -M6N/0u7xBdk9jvTLTVfmzY0nJXR2YyuiOxwD3MR2EY/E9bwS5Ji8A66aqQFZwQTK -6HpslwpCD6GlXOmf74m/D6oMFOD5ZV0QestimGRge9IIxa07Q5wa/2sLHErxqK6i -PadDH+10OPZledBtTjqJ1SO+M+E1SSTH36sNZNRLdmSh9jPNnhONdjvYy/5UuwjD -vN45j0geJ1xNBRff+We7PrluSuQecyICGIg4pwIDAQABAoIBADH43r9FBl7noOrR -eAxFU53CmtlAk7i2yBEUg651z1oDjFaWshFcHXCk2gXCEAxYvoTLPa3To1FqIvzh -f+ukC6c5Mww157tyi5Mjs4xEbR8xE4ICKraJbSvsTAmVzXZ7Y5BjtafeM+ImI9RL -+4r8k+0YgM6lq2ZnjA96CPTVzrchrJt8isjuS3F45Oiy19DNMJXGcLHJVlU3Lm69 -8A77Mf8ertXtVJohAgEK4hnmDrMA4GqghvPtu8Wh3GmC91pP0fCIICnYi4x3iKLq -l94a5usxBcozkL5iqfhFm1mBDCDuSHpKoKrNY/fZU3oiTpgctzKPY0xtXqtkuh1d -MSAgxAECgYEA6ir+mXLAsT84RHTujnwBzuL17an58mytR6+rBFgIJ/WiwzFtMvfj -noL0De6mQNtATIelxemJBbfAY9RVmjLrJ3080NsH9ZmvaUIBaFHwmLJBUa01cVZO -lBhfOzYJJus9kFoGq7VOro3DMe/qICbCrBT26lt4jMiFg9sOmDR9ycsCgYEA5yuP -FM6zDEXD3l8ROskFadwQiZeBa6oYITcT6yD9ZQs1N+zWYVEiAb5T5l/5Ava8CwWD -z0vXohyUK7WQYhDTnZy5vn+Er6j0F8GH9JEe3mHIHdTuNzQz5YG+k1LFHTeW05N4 -IKrEMQCBj9yjwACGqy1S1bebJM1rvGklKFkqoRUCgYAXnxytuACuIJV5el4yK1o3 -V3e9cL8Q8FuOdq8GsiaoeUPg8tR0JsNkUwtxeFh3BGb5EVnsnAFBfWa/60RzWJ2W -DzEaVG36HXWvZYQk1NczYA/swE86zp0AnXDF1U6ZCXPdYud3XMPCIfTFzdDNS3up -xjeeLnn7oaKuSWOwgOMLfwKBgFVh41EeH0ezJOsnVefOg69b1sfbK7QmeQ8blsHL -x4vgneFwGqaLHvJh5/85B3Iuy7mOaebQ7m4z/A5A23k9GcwnLPvNgaaX0sBLfPm5 -+BrPJujN0saVA24Lg+ZKNf/anly7JS17pUcsFq6aIekyyIrFDMlfLXBkZxyKAW1r -sbEZAoGAb9jvdsjeAL4US0LkK82+y2UQ4hxPOIvsrUyO3F1ULvy2JYUojw/TBlzP -wP7YN1PHAba7LnhGY6qWDUoTJrftpjQO2EXxtMWGU8M/YtMByicpb3ahKUM6mH9l -HWQQgu/Di5IycZ5OUR8/Xp2BdC6Oh6OT2vte26wsFHC9yxg+hAQ= ------END RSA PRIVATE KEY----- diff --git a/.vagrant/machines/fedora29/libvirt/synced_folders b/.vagrant/machines/fedora29/libvirt/synced_folders deleted file mode 100644 index 9e26dfe..0000000 --- a/.vagrant/machines/fedora29/libvirt/synced_folders +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/.vagrant/machines/fedora29/libvirt/vagrant_cwd b/.vagrant/machines/fedora29/libvirt/vagrant_cwd deleted file mode 100644 index 9b2b41f..0000000 --- a/.vagrant/machines/fedora29/libvirt/vagrant_cwd +++ /dev/null @@ -1 +0,0 @@ -/home/robertdb/Documents/github.com/robertdebock/ansible-development-environment \ No newline at end of file diff --git a/README.md b/README.md index 64e6367..7453698 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,25 @@ Download all required roles: ansible-galaxy install --role-file roles/requirements.yml ``` +## Mac / Linux + +Vagrant requires a different file for `Virtualbox` (typically Mac OS X) and `libvirt` (typically Linux). + +For Virtualbox / Mac OS X: + +```sh +rm Vagrantfile +ln -s Vagrantfile.virtualbox Vagrantfile +``` + +For libvirt / Linux: + + +```sh +rm Vagrantfile +ln -s Vagrantfile.libvirt Vagrantfile +``` + Now change a few files: - `files/gitconfig` should contain your details. diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index b739609..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,10 +0,0 @@ -Vagrant.configure("2") do |config| - config.vm.define "fedora29" do |fedora28| - fedora28.vm.box = "fedora/29-cloud-base" - fedora28.vm.synced_folder '.', '/vagrant', disabled: true - fedora28.vm.provider :libvirt do |domain| - domain.memory = 4096 - domain.cpus = 4 - end - end -end diff --git a/Vagrantfile b/Vagrantfile new file mode 120000 index 0000000..3f83971 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1 @@ +Vagrantfile.virtualbox \ No newline at end of file diff --git a/Vagrantfile.libvirt b/Vagrantfile.libvirt new file mode 100644 index 0000000..b739609 --- /dev/null +++ b/Vagrantfile.libvirt @@ -0,0 +1,10 @@ +Vagrant.configure("2") do |config| + config.vm.define "fedora29" do |fedora28| + fedora28.vm.box = "fedora/29-cloud-base" + fedora28.vm.synced_folder '.', '/vagrant', disabled: true + fedora28.vm.provider :libvirt do |domain| + domain.memory = 4096 + domain.cpus = 4 + end + end +end diff --git a/Vagrantfile.virtualbox b/Vagrantfile.virtualbox new file mode 100644 index 0000000..27dba9e --- /dev/null +++ b/Vagrantfile.virtualbox @@ -0,0 +1,13 @@ +Vagrant.configure("2") do |config| + config.vm.define "fedora29" do |fedora28| + fedora28.vm.box = "fedora/29-cloud-base" + fedora28.vm.synced_folder '.', '/vagrant', disabled: true + config.vm.provider "virtualbox" do |v| + v.memory = 4096 + v.cpus = 2 + end + end +end + + +