[Fusionforge-commits] FusionForge branch master updated. db7dd918258c3aaf2efb10d95da18928228ecffe

Sylvain Beucler beuc-inria at fusionforge.org
Mon Mar 10 15:02:16 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  db7dd918258c3aaf2efb10d95da18928228ecffe (commit)
       via  93c7f50a3d4129ec928ee84709ea1faa77e3248f (commit)
      from  dc61ef8ad815dfda963be5faba6d94381b3ac62c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit db7dd918258c3aaf2efb10d95da18928228ecffe
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Mar 10 14:59:42 2014 +0100

    VM: Centos support

diff --git a/vm/Vagrantfile b/vm/Vagrantfile
index 58fccd0..6aaea94 100644
--- a/vm/Vagrantfile
+++ b/vm/Vagrantfile
@@ -14,7 +14,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
-  config.vm.box_url = "../ff/tools/VM-bootstrap/fusionforge-dev.box"
+  config.vm.box_url = "http://fusionforge.fusionforge.org/sandbox/fusionforge-dev-debian.box"
 
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
diff --git a/vm/packer/.gitignore b/vm/packer/.gitignore
index 0628277..f1eb287 100644
--- a/vm/packer/.gitignore
+++ b/vm/packer/.gitignore
@@ -1,2 +1,2 @@
-fusionforge-dev.box
+*.box
 packer_cache/
diff --git a/vm/packer/README b/vm/packer/README
index ec8c7f7..6a3be13 100644
--- a/vm/packer/README
+++ b/vm/packer/README
@@ -8,13 +8,13 @@ See https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Virtual
 
 Simple rebuild of the .box:
 
-  packer build -only=virtualbox-iso fusionforge-dev.json
+  packer build -only=virtualbox-iso fusionforge-dev-debian.json
   packer build -only=qemu fusionforge-dev.json  # lacks .box export support as of 2014-01
-
+  packer build -only=virtualbox-iso fusionforge-dev-centos.json
 
 Debug fusionforge.sh:
 
-  sed -e 's:"scripts/fusionforge.sh",::' -e 's/fusionforge-dev.box/bare.box/' fusionforge-dev.json > bare.json
+  sed -e 's:"scripts/fusionforge.sh",::' -e 's/fusionforge-dev.box/bare.box/' fusionforge-dev-debian.json > bare.json
   packer build -only=virtualbox-iso bare.json && tar xf bare.box
   packer build fusionforge-dev-from_ovf.json  # debug: KO, modify fusionforge.sh
   packer build fusionforge-dev-from_ovf.json  # debug: KO, modify fusionforge.sh
diff --git a/vm/packer/file/bashrc b/vm/packer/file/bashrc
index 9d8ef4d..735e5bf 100644
--- a/vm/packer/file/bashrc
+++ b/vm/packer/file/bashrc
@@ -4,7 +4,7 @@
 # need this unless you want different defaults for root.
 # PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ '
 # umask 022
-PS1='VAGRANT:\h:\w\$ '
+PS1='DEV:\h:\w\$ '
 
 # You may uncomment the following lines if you want `ls' to be colorized:
 export LS_OPTIONS='--color=auto'
diff --git a/vm/packer/fusionforge-dev-centos.json b/vm/packer/fusionforge-dev-centos.json
new file mode 100644
index 0000000..05adee2
--- /dev/null
+++ b/vm/packer/fusionforge-dev-centos.json
@@ -0,0 +1,57 @@
+{
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "scripts/base-centos.sh",
+        "scripts/vagrant.sh",
+        "scripts/virtualbox-centos.sh",
+        "scripts/fusionforge-source.sh",
+        "scripts/cleanup-centos.sh",
+        "scripts/zerodisk.sh"
+      ]
+    }
+  ],
+  "builders": [
+    {
+      "type": "virtualbox-iso",
+      "boot_command": [
+        "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>"
+      ],
+      "boot_wait": "10s",
+      "disk_size": 10140,
+      "guest_os_type": "RedHat_64",
+      "http_directory": "http",
+      "iso_checksum": "0d9dc37b5dd4befa1c440d2174e88a87",
+      "iso_checksum_type": "md5",
+      "iso_url": "http://yum.singlehop.com/CentOS/6.5/isos/x86_64/CentOS-6.5-x86_64-minimal.iso",
+      "ssh_username": "root",
+      "ssh_password": "vagrant",
+      "ssh_port": 22,
+      "ssh_wait_timeout": "10000s",
+      "shutdown_command": "poweroff",
+      "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "virtualbox_version_file": ".vbox_version",
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "480"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "1"
+        ]
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "output": "fusionforge-dev-centos.box"
+    }
+  ]
+}
diff --git a/vm/packer/fusionforge-dev.json b/vm/packer/fusionforge-dev-debian.json
similarity index 89%
rename from vm/packer/fusionforge-dev.json
rename to vm/packer/fusionforge-dev-debian.json
index 3af4525..b2a04e3 100644
--- a/vm/packer/fusionforge-dev.json
+++ b/vm/packer/fusionforge-dev-debian.json
@@ -13,11 +13,12 @@
 		{
 			"type": "shell",
 			"scripts": [
-				"scripts/base.sh",
+				"scripts/base-debian.sh",
 				"scripts/vagrant.sh",
-				"scripts/virtualbox.sh",
+				"scripts/virtualbox-debian.sh",
 				"scripts/fusionforge-source.sh",
-				"scripts/cleanup.sh"
+				"scripts/cleanup-debian.sh",
+				"scripts/zerodisk.sh"
 			]
 		}
 	],
@@ -29,7 +30,7 @@
 				"auto ",
 				"url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
 				"netcfg/get_hostname=forge ",
-				"netcfg/get_domain=local ",
+				"netcfg/get_domain=internal ",
 				"<enter>"
 			],
 			"disk_size": 7168,
@@ -78,7 +79,7 @@
 				"auto ",
 				"url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
 				"netcfg/get_hostname=forge ",
-				"netcfg/get_domain=local ",
+				"netcfg/get_domain=internal ",
 				"debian-installer/exit/poweroff=true",
 				"<enter>"
 			]
@@ -87,7 +88,7 @@
 	"post-processors": [
 		{
 			"type": "vagrant",
-			"output": "fusionforge-dev.box"
+			"output": "fusionforge-dev-debian.box"
 		}
 	]
 }
diff --git a/vm/packer/fusionforge-dev-from_ovf.json b/vm/packer/fusionforge-dev-from_ovf.json
index 01eca5a..27f982f 100644
--- a/vm/packer/fusionforge-dev-from_ovf.json
+++ b/vm/packer/fusionforge-dev-from_ovf.json
@@ -4,19 +4,14 @@
 			"type": "shell",
 			"scripts": [
 				"scripts/fusionforge.sh"
-			],
-			"override": {
-				"virtualbox-ovf": {
-					"execute_command": "echo 'vagrant'|sudo -S bash '{{.Path}}'"
-				}
-			}
+			]
 		}
 	],
 	"builders": [
 		{
 			"type": "virtualbox-ovf",
 			"source_path": "box.ovf",
-			"ssh_username": "vagrant",
+			"ssh_username": "root",
 			"ssh_password": "vagrant",
 			"ssh_wait_timeout": "30s",
 		}
diff --git a/vm/packer/http/ks.cfg b/vm/packer/http/ks.cfg
new file mode 100644
index 0000000..1c7c90c
--- /dev/null
+++ b/vm/packer/http/ks.cfg
@@ -0,0 +1,26 @@
+install
+cdrom
+lang en_US.UTF-8
+keyboard us
+network --bootproto=dhcp --hostname forge.internal
+rootpw vagrant
+firewall --enabled --service=ssh
+authconfig --enableshadow --passalgo=sha512
+selinux --disabled
+timezone UTC
+bootloader --location=mbr
+
+text
+skipx
+zerombr
+
+clearpart --all --initlabel
+autopart
+
+auth  --useshadow  --enablemd5
+firstboot --disabled
+reboot
+
+%packages --nobase
+ at core
+%end
diff --git a/vm/packer/http/preseed.cfg b/vm/packer/http/preseed.cfg
index 8734c1f..fa6ac36 100755
--- a/vm/packer/http/preseed.cfg
+++ b/vm/packer/http/preseed.cfg
@@ -46,7 +46,9 @@ d-i netcfg/choose_interface select auto
 # If you select ftp, the mirror/country string does not need to be set.
 #d-i mirror/protocol string ftp
 d-i mirror/country string manual
-d-i mirror/http/hostname string http.debian.net
+# http.debian.net is repeatedly stalling for unknown reason
+#d-i mirror/http/hostname string http.debian.net
+d-i mirror/http/hostname string ftp.fr.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 
@@ -161,11 +163,12 @@ d-i passwd/root-password-again password vagrant
 #d-i passwd/root-password-crypted password [MD5 hash]
 
 # To create a normal user account.
-d-i passwd/user-fullname string Vagrant User
-d-i passwd/username string vagrant
+d-i passwd/make-user boolean false
+#d-i passwd/user-fullname string Vagrant User
+#d-i passwd/username string vagrant
 # Normal user's password, either in clear text
-d-i passwd/user-password password vagrant
-d-i passwd/user-password-again password vagrant
+#d-i passwd/user-password password vagrant
+#d-i passwd/user-password-again password vagrant
 # or encrypted using an MD5 hash.
 #d-i passwd/user-password-crypted password [MD5 hash]
 # Create the first user with the specified UID instead of the default.
@@ -202,7 +205,7 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid gpm  sudo bzip2 rsync  emacs23-nox vim
+d-i pkgsel/include string openssh-server ntp acpid
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
@@ -268,6 +271,6 @@ di base-installer/install-recommends false
 # still a usable /target directory. You can chroot to /target and use it
 # directly, or use the apt-install and in-target commands to easily install
 # packages and run commands in the target system.
-d-i preseed/late_command string \
-  echo %vagrant ALL=NOPASSWD:ALL > /target/etc/sudoers.d/vagrant; \
-  in-target chmod 0440 /etc/sudoers.d/vagrant
+#d-i preseed/late_command string \
+#  echo %vagrant ALL=NOPASSWD:ALL > /target/etc/sudoers.d/vagrant; \
+#  in-target chmod 0440 /etc/sudoers.d/vagrant
diff --git a/vm/packer/scripts/base-centos.sh b/vm/packer/scripts/base-centos.sh
new file mode 100644
index 0000000..3073512
--- /dev/null
+++ b/vm/packer/scripts/base-centos.sh
@@ -0,0 +1,8 @@
+# Update the box
+yum -y update
+yum -y install wget curl unzip sudo gpm bzip2 rsync emacs-nox vim
+
+# Tweak sshd to prevent DNS resolution (speed up logins)
+echo 'UseDNS no' >> /etc/ssh/sshd_config
+
+sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
diff --git a/vm/packer/scripts/base.sh b/vm/packer/scripts/base-debian.sh
similarity index 85%
rename from vm/packer/scripts/base.sh
rename to vm/packer/scripts/base-debian.sh
index 083d200..fd334a5 100755
--- a/vm/packer/scripts/base.sh
+++ b/vm/packer/scripts/base-debian.sh
@@ -2,10 +2,7 @@
 apt-get -y --force-yes update
 #apt-get -y --force-yes install linux-headers-$(uname -r) build-essential
 #apt-get -y --force-yes install zlib1g-dev libssl-dev libreadline-gplv2-dev
-apt-get -y --force-yes install curl unzip
-
-# Set up sudo
-echo 'vagrant ALL=NOPASSWD:ALL' > /etc/sudoers.d/vagrant
+apt-get -y --force-yes install wget curl unzip sudo gpm bzip2 rsync emacs23-nox vim
 
 # Tweak sshd to prevent DNS resolution (speed up logins)
 echo 'UseDNS no' >> /etc/ssh/sshd_config
diff --git a/vm/packer/scripts/cleanup-centos.sh b/vm/packer/scripts/cleanup-centos.sh
new file mode 100644
index 0000000..a034ee7
--- /dev/null
+++ b/vm/packer/scripts/cleanup-centos.sh
@@ -0,0 +1,6 @@
+yum -y clean all
+yum -y install gpm bzip2 rsync emacs-nox vim
+
+# Remove traces of mac address from network configuration
+sed -i /HWADDR/d /etc/sysconfig/network-scripts/ifcfg-eth0
+rm /etc/udev/rules.d/70-persistent-net.rules
diff --git a/vm/packer/scripts/cleanup.sh b/vm/packer/scripts/cleanup-debian.sh
similarity index 87%
rename from vm/packer/scripts/cleanup.sh
rename to vm/packer/scripts/cleanup-debian.sh
index b783589..5ab6d2b 100755
--- a/vm/packer/scripts/cleanup.sh
+++ b/vm/packer/scripts/cleanup-debian.sh
@@ -25,8 +25,3 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
 
 echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
 echo "pre-up sleep 2" >> /etc/network/interfaces
-
-# Zero out the free space to save space in the final image:
-echo "Zeroing device to make space..."
-dd if=/dev/zero of=/EMPTY bs=1M
-rm -f /EMPTY
\ No newline at end of file
diff --git a/vm/packer/scripts/fusionforge-source.sh b/vm/packer/scripts/fusionforge-source.sh
index 5cedad0..0625c19 100644
--- a/vm/packer/scripts/fusionforge-source.sh
+++ b/vm/packer/scripts/fusionforge-source.sh
@@ -11,6 +11,13 @@ Default language is English.
 EOF
 
 # Install sources
-apt-get -y --force-yes install bzr
-cd /root/
-bzr checkout https://fusionforge.org/anonscm/bzr/deb-packaging/master fusionforge
+if [ -e /etc/debian_version ]; then
+    apt-get -y --force-yes install git
+    repo=git://fusionforge.org/deb-packaging/deb-packaging.git
+else
+    echo "TODO: instructions for CentOS" >> /etc/issue
+    yum -y install git
+    repo=git://fusionforge.org/fusionforge/fusionforge.git
+fi
+cd /usr/src/
+git clone $repo fusionforge/
diff --git a/vm/packer/scripts/puppet.sh b/vm/packer/scripts/puppet.sh
deleted file mode 100755
index ba38575..0000000
--- a/vm/packer/scripts/puppet.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Install puppet/facter
-apt-get install -y puppet facter
diff --git a/vm/packer/scripts/vagrant.sh b/vm/packer/scripts/vagrant.sh
index d940cd0..99c26ad 100755
--- a/vm/packer/scripts/vagrant.sh
+++ b/vm/packer/scripts/vagrant.sh
@@ -1,29 +1,19 @@
 #!/bin/bash
 
 # Create the user vagrant with password vagrant
-# cf. http/preseed.cfg
-#useradd -G sudo -p $(perl -e'print crypt("vagrant", "vagrant")') -m -s /bin/bash -N vagrant
-
-# Set up sudo - cf. http/preseed.cfg:late_command
-#echo %vagrant ALL=NOPASSWD:ALL > /etc/sudoers.d/vagrant
-#chmod 0440 /etc/sudoers.d/vagrant
+useradd vagrant
+echo 'vagrant'|passwd --stdin vagrant
+echo 'vagrant ALL=NOPASSWD:ALL' > /etc/sudoers.d/vagrant
+chmod 0440 /etc/sudoers.d/vagrant
 
 # Installing vagrant keys
 # Cf. http://docs.vagrantup.com/v2/boxes/base.html
-mkdir /home/vagrant/.ssh
-cd /home/vagrant/.ssh
-chmod 700 .
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
-chmod 600 authorized_keys
-chown -R vagrant .
+mkdir -pm 700 /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
+chmod 0600 /home/vagrant/.ssh/authorized_keys
+chown -R vagrant /home/vagrant/.ssh
 
 # Install a copy for root, so we can 'vagrant ssh -- -l root'
-mkdir /root/.ssh
-cd /root/.ssh
-chmod 700 .
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
-chmod 600 authorized_keys
-
-# Install NFS for Vagrant
-#apt-get -y --force-yes update
-#apt-get -y --force-yes install nfs-common
+mkdir -pm 700 /root/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /root/.ssh/authorized_keys
+chmod 0600 /root/.ssh/authorized_keys
diff --git a/vm/packer/scripts/virtualbox-centos.sh b/vm/packer/scripts/virtualbox-centos.sh
new file mode 100644
index 0000000..7a48858
--- /dev/null
+++ b/vm/packer/scripts/virtualbox-centos.sh
@@ -0,0 +1,26 @@
+if test -f .vbox_version ; then
+    # Installing the virtualbox guest additions
+    VBOX_VERSION=$(cat .vbox_version)
+    
+    # For dmks
+    cat > /etc/yum.repos.d/epel.repo << EOM
+[epel]
+name=epel
+baseurl=http://download.fedoraproject.org/pub/epel/6/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+    
+    # Build dependencies for VirtualBox guest additions
+    yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl dkms nfs-utils
+    
+    mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+    sh /mnt/VBoxLinuxAdditions.run
+    umount /mnt
+    rm -rf VBoxGuestAdditions_*.iso
+    
+    # TODO: FIXME: this leads to yum trying to remove 'yum' through a chain of dependencies
+    #yum -y erase   gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel readline-devel sqlite-devel perl dkms nfs-utils
+    rm -rf /etc/yum.repos.d/epel.repo
+    rm -rf VBoxGuestAdditions_*.iso
+fi
diff --git a/vm/packer/scripts/virtualbox.sh b/vm/packer/scripts/virtualbox-debian.sh
similarity index 81%
rename from vm/packer/scripts/virtualbox.sh
rename to vm/packer/scripts/virtualbox-debian.sh
index f0936ef..254404c 100755
--- a/vm/packer/scripts/virtualbox.sh
+++ b/vm/packer/scripts/virtualbox-debian.sh
@@ -1,3 +1,4 @@
 if test -f .vbox_version ; then
+  # Use version from Debian
   apt-get -y install --no-install-recommends linux-headers-amd64 virtualbox-guest-dkms
 fi
diff --git a/vm/packer/scripts/zerodisk.sh b/vm/packer/scripts/zerodisk.sh
new file mode 100644
index 0000000..c434f75
--- /dev/null
+++ b/vm/packer/scripts/zerodisk.sh
@@ -0,0 +1,4 @@
+# Zero out the free space to save space in the final image:
+echo "Zeroing device to make space..."
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY

commit 93c7f50a3d4129ec928ee84709ea1faa77e3248f
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Mar 10 11:31:24 2014 +0100

    Group vm files

diff --git a/vm/Vagrantfile b/vm/Vagrantfile
new file mode 100644
index 0000000..58fccd0
--- /dev/null
+++ b/vm/Vagrantfile
@@ -0,0 +1,119 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "fusionforge-dev"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  config.vm.box_url = "../ff/tools/VM-bootstrap/fusionforge-dev.box"
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  config.vm.network :forwarded_port, guest: 80,  host: 8080
+  config.vm.network :forwarded_port, guest: 443, host: 8443
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network :private_network, ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network :public_network
+
+  # If true, then any SSH connections made will enable agent forwarding.
+  # Default value: false
+  # config.ssh.forward_agent = true
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  config.vm.provider :virtualbox do |vb|
+  #   # Don't boot with headless mode
+  #  vb.gui = true
+  #
+  #   # Use VBoxManage to customize the VM. For example to change memory:
+  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
+  end
+  #
+  # View the documentation for the provider you're using for more
+  # information on available options.
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file fusionforge-dev.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "site.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding
+  # some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # If you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end
diff --git a/tools/VM-bootstrap/.gitignore b/vm/packer/.gitignore
similarity index 100%
rename from tools/VM-bootstrap/.gitignore
rename to vm/packer/.gitignore
diff --git a/tools/VM-bootstrap/README b/vm/packer/README
similarity index 100%
rename from tools/VM-bootstrap/README
rename to vm/packer/README
diff --git a/tools/VM-bootstrap/file/Desktop/README.desktop b/vm/packer/file/Desktop/README.desktop
similarity index 100%
rename from tools/VM-bootstrap/file/Desktop/README.desktop
rename to vm/packer/file/Desktop/README.desktop
diff --git a/tools/VM-bootstrap/file/Desktop/build-and-install.desktop b/vm/packer/file/Desktop/build-and-install.desktop
similarity index 100%
rename from tools/VM-bootstrap/file/Desktop/build-and-install.desktop
rename to vm/packer/file/Desktop/build-and-install.desktop
diff --git a/tools/VM-bootstrap/file/Desktop/run-testsuite.desktop b/vm/packer/file/Desktop/run-testsuite.desktop
similarity index 100%
rename from tools/VM-bootstrap/file/Desktop/run-testsuite.desktop
rename to vm/packer/file/Desktop/run-testsuite.desktop
diff --git a/tools/VM-bootstrap/file/bashrc b/vm/packer/file/bashrc
similarity index 100%
rename from tools/VM-bootstrap/file/bashrc
rename to vm/packer/file/bashrc
diff --git a/tools/VM-bootstrap/fusionforge-dev-from_ovf.json b/vm/packer/fusionforge-dev-from_ovf.json
similarity index 100%
rename from tools/VM-bootstrap/fusionforge-dev-from_ovf.json
rename to vm/packer/fusionforge-dev-from_ovf.json
diff --git a/tools/VM-bootstrap/fusionforge-dev.json b/vm/packer/fusionforge-dev.json
similarity index 100%
rename from tools/VM-bootstrap/fusionforge-dev.json
rename to vm/packer/fusionforge-dev.json
diff --git a/tools/VM-bootstrap/http/preseed.cfg b/vm/packer/http/preseed.cfg
similarity index 100%
rename from tools/VM-bootstrap/http/preseed.cfg
rename to vm/packer/http/preseed.cfg
diff --git a/tools/VM-bootstrap/scripts/base.sh b/vm/packer/scripts/base.sh
similarity index 100%
rename from tools/VM-bootstrap/scripts/base.sh
rename to vm/packer/scripts/base.sh
diff --git a/tools/VM-bootstrap/scripts/cleanup.sh b/vm/packer/scripts/cleanup.sh
similarity index 100%
rename from tools/VM-bootstrap/scripts/cleanup.sh
rename to vm/packer/scripts/cleanup.sh
diff --git a/tools/VM-bootstrap/scripts/fusionforge-source.sh b/vm/packer/scripts/fusionforge-source.sh
similarity index 100%
rename from tools/VM-bootstrap/scripts/fusionforge-source.sh
rename to vm/packer/scripts/fusionforge-source.sh
diff --git a/tools/VM-bootstrap/scripts/puppet.sh b/vm/packer/scripts/puppet.sh
similarity index 100%
rename from tools/VM-bootstrap/scripts/puppet.sh
rename to vm/packer/scripts/puppet.sh
diff --git a/tools/VM-bootstrap/scripts/vagrant.sh b/vm/packer/scripts/vagrant.sh
similarity index 100%
rename from tools/VM-bootstrap/scripts/vagrant.sh
rename to vm/packer/scripts/vagrant.sh
diff --git a/tools/VM-bootstrap/scripts/virtualbox.sh b/vm/packer/scripts/virtualbox.sh
similarity index 100%
rename from tools/VM-bootstrap/scripts/virtualbox.sh
rename to vm/packer/scripts/virtualbox.sh
diff --git a/tools/VM-scripts/README.txt b/vm/scripts/README.txt
similarity index 100%
rename from tools/VM-scripts/README.txt
rename to vm/scripts/README.txt
diff --git a/tools/VM-scripts/build.sh b/vm/scripts/build.sh
similarity index 100%
rename from tools/VM-scripts/build.sh
rename to vm/scripts/build.sh
diff --git a/tools/VM-scripts/install-gui.sh b/vm/scripts/install-gui.sh
similarity index 100%
rename from tools/VM-scripts/install-gui.sh
rename to vm/scripts/install-gui.sh
diff --git a/tools/VM-scripts/install.sh b/vm/scripts/install.sh
similarity index 100%
rename from tools/VM-scripts/install.sh
rename to vm/scripts/install.sh
diff --git a/tools/VM-scripts/run-testsuite.sh b/vm/scripts/run-testsuite.sh
similarity index 100%
rename from tools/VM-scripts/run-testsuite.sh
rename to vm/scripts/run-testsuite.sh
diff --git a/tools/VM-scripts/update.sh b/vm/scripts/update.sh
similarity index 100%
rename from tools/VM-scripts/update.sh
rename to vm/scripts/update.sh

-----------------------------------------------------------------------

Summary of changes:
 tools/VM-bootstrap/.gitignore                      |    2 -
 tools/VM-bootstrap/scripts/fusionforge-source.sh   |   16 ---
 tools/VM-bootstrap/scripts/puppet.sh               |    2 -
 tools/VM-bootstrap/scripts/vagrant.sh              |   29 -----
 vm/Vagrantfile                                     |  119 ++++++++++++++++++++
 vm/packer/.gitignore                               |    2 +
 {tools/VM-bootstrap => vm/packer}/README           |    6 +-
 .../packer}/file/Desktop/README.desktop            |    0
 .../packer}/file/Desktop/build-and-install.desktop |    0
 .../packer}/file/Desktop/run-testsuite.desktop     |    0
 {tools/VM-bootstrap => vm/packer}/file/bashrc      |    2 +-
 vm/packer/fusionforge-dev-centos.json              |   57 ++++++++++
 .../packer/fusionforge-dev-debian.json             |   13 ++-
 .../packer}/fusionforge-dev-from_ovf.json          |    9 +-
 vm/packer/http/ks.cfg                              |   26 +++++
 {tools/VM-bootstrap => vm/packer}/http/preseed.cfg |   21 ++--
 vm/packer/scripts/base-centos.sh                   |    8 ++
 .../base.sh => vm/packer/scripts/base-debian.sh    |    5 +-
 vm/packer/scripts/cleanup-centos.sh                |    6 +
 .../packer/scripts/cleanup-debian.sh               |    5 -
 vm/packer/scripts/fusionforge-source.sh            |   23 ++++
 vm/packer/scripts/vagrant.sh                       |   19 ++++
 vm/packer/scripts/virtualbox-centos.sh             |   26 +++++
 .../packer/scripts/virtualbox-debian.sh            |    1 +
 vm/packer/scripts/zerodisk.sh                      |    4 +
 {tools/VM-scripts => vm/scripts}/README.txt        |    0
 {tools/VM-scripts => vm/scripts}/build.sh          |    0
 {tools/VM-scripts => vm/scripts}/install-gui.sh    |    0
 {tools/VM-scripts => vm/scripts}/install.sh        |    0
 {tools/VM-scripts => vm/scripts}/run-testsuite.sh  |    0
 {tools/VM-scripts => vm/scripts}/update.sh         |    0
 31 files changed, 317 insertions(+), 84 deletions(-)
 delete mode 100644 tools/VM-bootstrap/.gitignore
 delete mode 100644 tools/VM-bootstrap/scripts/fusionforge-source.sh
 delete mode 100755 tools/VM-bootstrap/scripts/puppet.sh
 delete mode 100755 tools/VM-bootstrap/scripts/vagrant.sh
 create mode 100644 vm/Vagrantfile
 create mode 100644 vm/packer/.gitignore
 rename {tools/VM-bootstrap => vm/packer}/README (86%)
 rename {tools/VM-bootstrap => vm/packer}/file/Desktop/README.desktop (100%)
 rename {tools/VM-bootstrap => vm/packer}/file/Desktop/build-and-install.desktop (100%)
 rename {tools/VM-bootstrap => vm/packer}/file/Desktop/run-testsuite.desktop (100%)
 rename {tools/VM-bootstrap => vm/packer}/file/bashrc (96%)
 create mode 100644 vm/packer/fusionforge-dev-centos.json
 rename tools/VM-bootstrap/fusionforge-dev.json => vm/packer/fusionforge-dev-debian.json (89%)
 rename {tools/VM-bootstrap => vm/packer}/fusionforge-dev-from_ovf.json (61%)
 create mode 100644 vm/packer/http/ks.cfg
 rename {tools/VM-bootstrap => vm/packer}/http/preseed.cfg (95%)
 create mode 100644 vm/packer/scripts/base-centos.sh
 rename tools/VM-bootstrap/scripts/base.sh => vm/packer/scripts/base-debian.sh (85%)
 create mode 100644 vm/packer/scripts/cleanup-centos.sh
 rename tools/VM-bootstrap/scripts/cleanup.sh => vm/packer/scripts/cleanup-debian.sh (87%)
 create mode 100644 vm/packer/scripts/fusionforge-source.sh
 create mode 100755 vm/packer/scripts/vagrant.sh
 create mode 100644 vm/packer/scripts/virtualbox-centos.sh
 rename tools/VM-bootstrap/scripts/virtualbox.sh => vm/packer/scripts/virtualbox-debian.sh (81%)
 create mode 100644 vm/packer/scripts/zerodisk.sh
 rename {tools/VM-scripts => vm/scripts}/README.txt (100%)
 rename {tools/VM-scripts => vm/scripts}/build.sh (100%)
 rename {tools/VM-scripts => vm/scripts}/install-gui.sh (100%)
 rename {tools/VM-scripts => vm/scripts}/install.sh (100%)
 rename {tools/VM-scripts => vm/scripts}/run-testsuite.sh (100%)
 rename {tools/VM-scripts => vm/scripts}/update.sh (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list