kameleon-builder 2.2.3 → 2.2.4

data/templates/steps/bootstrap/start_virtualbox.yaml

@@ -7,13 +7,14 @@
   - exec_local: VBoxManage startvm  $$virtualbox_vmid --type headless 2>&1
   - exec_local: |
         NEXT_WAIT_TIME=0
-        until ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null || [ $NEXT_WAIT_TIME -eq $$boot_timeout ];
+        SSH_AVAILABLE=0
+        until ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null && SSH_AVAILABLE=1 || [ $NEXT_WAIT_TIME -eq $$boot_timeout ];
         do
           echo -en "\rWaiting for SSH to become available for out_context...($(( $$boot_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
         done
         echo ""
   - rescue:
-    - exec_local: ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null
+    - exec_local: test $SSH_AVAILABLE -eq 1
     - breakpoint: Failed to connect to VM via SSH. Please verify the VM successfully booted by looking at the VirtualBox GUI.
 
 - shutdown_vm:

data/templates/steps/bootstrap/switch_context_qemu.yaml

@@ -71,13 +71,14 @@
   - exec_local: echo system_reset | socat - UNIX-CONNECT:$$qemu_monitor_socket
   - exec_local: |
         NEXT_WAIT_TIME=0
-        until ssh-keyscan -T 1 -4 -p $$qemu_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null || [ $NEXT_WAIT_TIME -eq $$reboot_timeout ];
+        SSH_AVAILABLE=0
+        until ssh-keyscan -T 1 -4 -p $$qemu_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null && SSH_AVAILABLE=1 || [ $NEXT_WAIT_TIME -eq $$reboot_timeout ];
         do
-          echo -en "\rWaiting for SSH to become available for in_context...($(( $$reboot_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
+          echo -en "\rWaiting for SSH to become available for out_context...($(( $$reboot_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
         done
         echo ""
   - rescue:
-    - exec_local: ssh-keyscan -T 1 -4 -p $$qemu_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null
-    - breakpoint: Failed to connect to VM via SSH. Please verify the VM successfully booted by looking at the VirtualBox GUI.
+    - exec_local: test $SSH_AVAILABLE -eq 1
+    - breakpoint: Failed to connect to VM via SSH. Please verify the VM successfully booted with a vnc client.
 
   - reload_context: out

data/templates/steps/bootstrap/switch_context_virtualbox.yaml

@@ -73,13 +73,14 @@
   - exec_local: VBoxManage startvm  $$virtualbox_vmid --type headless 2>&1
   - exec_local: |
         NEXT_WAIT_TIME=0
-        until ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null || [ $NEXT_WAIT_TIME -eq $$reboot_timeout ];
+        SSH_AVAILABLE=0
+        until ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null && SSH_AVAILABLE=1 || [ $NEXT_WAIT_TIME -eq $$reboot_timeout ];
         do
-          echo -en "\rWaiting for SSH to become available for in_context...($(( $$reboot_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
+          echo -en "\rWaiting for SSH to become available for out_context...($(( $$reboot_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
         done
         echo ""
   - rescue:
-    - exec_local: ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null
+    - exec_local: test $SSH_AVAILABLE -eq 1
     - breakpoint: Failed to connect to VM via SSH. Please verify the VM successfully booted by looking at the VirtualBox GUI.
 
   - reload_context: out

data/templates/steps/export/save_appliance_from_g5k.yaml

@@ -2,7 +2,7 @@
 
 - save_as_g5k:
   - exec_out: echo "Using tgz g5k to Export the machine"
-  - exec_in: tgz-g5k $$filename.tar.gz
+  - exec_in: tgz-g5k $$in_cwd/$$filename.tar.gz
   - exec_out: |
       rsync -avz -e "ssh -F $$out_cwd/ssh_config" \
         $$kameleon_recipe_name:$$in_cwd/$$filename.tar.gz \

data/templates/steps/export/vagrant_save_appliance.yaml

@@ -0,0 +1,7 @@
+# Save Appliance from virtualbox ti vagrant
+
+- save_box:
+  - check_cmd_local: vagrant
+  - exec_local: echo "Exporting appliance to $$output.box..."
+  - exec_local: rm -f $$output.box
+  - exec_local: vagrant package --base $$virtualbox_vmid --output $$output.box

data/templates/steps/export/virtualbox_save_appliance.yaml

@@ -59,9 +59,3 @@
   - check_cmd_local: qemu-img
   - exec_local: echo "Exporting appliance to $$output.qed..."
   - exec_local: qemu-img convert -O qed $$virtualbox_image_disk $$output.qed
-
-- save_as_vagrant_box:
-  - check_cmd_local: vagrant
-  - exec_local: echo "Exporting appliance to $$output.box..."
-  - exec_local: rm -f $$output.box
-  - exec_local: vagrant package --base $$virtualbox_vmid --output $$output.box

data/templates/steps/setup/centos/6.5/configure_repo.yaml

@@ -0,0 +1,9 @@
+- add_epel_repo:
+  - write_in:
+    - /etc/yum.repos.d/epel.repo 
+    - |
+      [epel]
+      name=epel
+      baseurl=http://download.fedoraproject.org/pub/epel/6/\$basearch
+      enabled=1
+      gpgcheck=0

data/templates/steps/setup/centos/6.5/configure_system.yaml

@@ -2,6 +2,7 @@
 #
 # This will set the locals and the timezone
 
+
 - set_locales:
   # uncomment the locales
   - exec_in: |
@@ -25,3 +26,21 @@
 
 - enable_ntpdate_service:
   - exec_in: chkconfig ntpd on
+
+- selinux: permissive
+- selinuxtype: targeted
+
+- configure_selinux:
+  - write_in:
+    - /etc/selinux/config
+    - |
+      # This file controls the state of SELinux on the system.
+      # SELINUX= can take one of these three values:
+      #       enforcing - SELinux security policy is enforced.
+      #       permissive - SELinux prints warnings instead of enforcing.
+      #       disabled - SELinux is fully disabled.
+      SELINUX=$$selinux
+      # SELINUXTYPE= type of policy in use. Possible values are:
+      #       targeted - Only targeted network daemons are protected.
+      #       strict - Full SELinux protection.
+      SELINUXTYPE=$$selinuxtype

data/templates/steps/setup/centos/6.5/minimal_install.yaml

@@ -0,0 +1,3 @@
+# Software Install
+- install_packages:
+  - exec_in: yum groupupdate --releasever=$$release 'Minimal Install' -y 2>&1

data/templates/steps/setup/centos/6.5/setup_vagrant_box.yaml

@@ -0,0 +1,76 @@
+- enable_passwordless_sudo:
+  - exec_in: |
+      sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
+      echo "$$user_name ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+- set_root_password:
+  - exec_in: echo -n 'root:$$user_name' | chpasswd
+
+- install_vbox_guest_additions:
+  - exec_in: echo "VirtualBox Guest Additions..."
+  - exec_in: |
+      wget --progress=bar:force http://download.virtualbox.org/virtualbox/4.3.8/VBoxGuestAdditions_4.3.8.iso 2>&1
+  - exec_in: mkdir /media/VBoxGuestAdditions
+  - exec_in: mount -o loop VBoxGuestAdditions_4.3.8.iso /media/VBoxGuestAdditions
+  - exec_in: yes|sh /media/VBoxGuestAdditions/VBoxLinuxAdditions.run --nox11 || true 2>&1
+  - exec_in: rm -f VBoxGuestAdditions_4.3.8.iso
+  - exec_in: umount /media/VBoxGuestAdditions
+  - exec_in: rmdir /media/VBoxGuestAdditions
+
+- install_puppet:
+  - exec_in: 
+  - write_in: 
+    - /etc/yum.repos.d/puppetlabs.repo
+    - |
+      [puppetlabs-dependencies]
+      name=puppetlabdsdependencies
+      baseurl=http://yum.puppetlabs.com/el/6/dependencies/\$basearch
+      enabled=1
+      gpgcheck=0
+      [puppetlabs]
+      name=puppetlabs
+      baseurl=http://yum.puppetlabs.com/el/6/products/\$basearch
+      enabled=1
+      gpgcheck=0
+  - exec_in: echo "Installing puppet..."
+  - exec_in: yum -y install puppet facter ruby-shadow 2>&1
+
+- install_chef:
+  - exec_in: curl -L https://www.opscode.com/chef/install.sh -k | bash
+
+- copy_insecure_sshkey:
+  - exec_in: mkdir -pm 700 /home/$$user_name/.ssh/
+  - exec_in: |
+      wget --progress=bar:force https://raw.github.com/mitchellh/vagrant/master/keys/vagrant -O /home/$$user_name/.ssh/id_rsa 2>&1
+      wget --progress=bar:force https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub -O /home/$$user_name/.ssh/id_rsa.pub 2>&1
+  - exec_in: cp /home/$$user_name/.ssh/id_rsa.pub /home/$$user_name/.ssh/authorized_keys
+  - exec_in: chmod 0600 /home/$$user_name/.ssh/*
+
+- config_ssh:
+  - exec_in: echo "UseDNS no" >> /etc/ssh/sshd_config
+  - write_in:
+    - /home/$$user_name/.ssh/config
+    - |
+      Host *
+      ForwardX11 no
+      StrictHostKeyChecking no
+      PasswordAuthentication no
+      AddressFamily inet
+  - exec_in: chmod 0600 /home/$$user_name/.ssh/config
+  - exec_in: rsync -ah /home/$$user_name/.ssh/ /root/.ssh/
+  - exec_in: chown "$$user_name:$$user_name" -R /home/$$user_name
+
+- customize_motd:
+  - exec_in: echo 'Welcome to your Vagrant-built virtual machine.' > /etc/motd
+
+- cleanup:
+  - exec_in: rm -rf /tmp/* || true
+  - exec_in: rm -rf /var/tmp/* || true
+  - exec_in: echo "cleaning up dhcp leases"
+  - exec_in: rm -f /etc/udev/rules.d/70-persistent-net.rules
+
+- nullify_freespace:
+  - exec_in: |
+      echo "Nullify freespace..."
+      dd if=/dev/zero of=/bigemptyfile bs=1M 2>&1 >/dev/null || true
+      rm -f /bigemptyfile

data/templates/steps/setup/debian/setup_vagrant_box.yaml

@@ -20,14 +20,12 @@
   - exec_in: rmdir /media/VBoxGuestAdditions
 
 - install_puppet:
-  - exec_in: echo "Installing puppet..."
-  - download_file_in:
-    - "http://apt.puppetlabs.com/puppetlabs-release-stable.deb"
-    - puppetlabs-release-stable.deb
-  - exec_in: dpkg -i "puppetlabs-release-stable.deb"
-  - exec_in: apt-get update
-  - exec_in: apt-get install puppet -y --force-yes
-  - exec_in: rm -f puppetlabs-release-stable.deb
+  - exec_in: |
+      wget --progress=bar:force http://apt.puppetlabs.com/puppetlabs-release-stable.deb 2>&1
+      dpkg -i puppetlabs-release-stable.deb
+      apt-get update
+      apt-get install puppet -y --force-yes
+      rm -f puppetlabs-release-stable.deb
 
 - install_chef:
   - exec_in: curl -L https://www.opscode.com/chef/install.sh -k | bash

data/templates/steps/setup/fedora/configure_system.yaml

@@ -32,3 +32,21 @@
 
 - enable_ntpdate_service:
   - exec_in: systemctl enable ntpdate.service
+
+- selinux: permissive
+- selinuxtype: targeted
+
+- configure_selinux:
+  - write_in:
+    - /etc/selinux/config
+    - |
+      # This file controls the state of SELinux on the system.
+      # SELINUX= can take one of these three values:
+      #       enforcing - SELinux security policy is enforced.
+      #       permissive - SELinux prints warnings instead of enforcing.
+      #       disabled - SELinux is fully disabled.
+      SELINUX=$$selinux
+      # SELINUXTYPE= type of policy in use. Possible values are:
+      #       targeted - Only targeted network daemons are protected.
+      #       strict - Full SELinux protection.
+      SELINUXTYPE=$$selinuxtype

data/templates/steps/setup/fedora/install_bootloader.yaml

@@ -36,11 +36,6 @@
       
       timeout $(( $$extlinux_timeout * 10 ))
 
-  - exec_in: |
-      if [ $$disable_selinux = true ]; then
-        SELINUX="selinux=0"
-      fi
-
   - exec_in: | 
       NAME="$$distrib"
       FIRST=1
@@ -53,6 +48,6 @@
           fi
           echo "  INITRD /boot/initramfs-$RELEASE.img" >> /boot/extlinux/extlinux.conf
           echo "  KERNEL $KERNEL" >> /boot/extlinux/extlinux.conf
-          echo "  APPEND root=UUID=`blkid -s UUID -o value $(__find_linux_boot_device)` rw net.ifnames=0 biosdevname=0 $SELINUX" >> /boot/extlinux/extlinux.conf
+          echo "  APPEND root=UUID=`blkid -s UUID -o value $(__find_linux_boot_device)` rw net.ifnames=0 biosdevname=0" >> /boot/extlinux/extlinux.conf
           echo >> /boot/extlinux/extlinux.conf
       done

data/templates/steps/setup/fedora/update_system.yaml

@@ -13,6 +13,6 @@
   - on_setup_clean:
     - exec_in: test ! -f /var/run/yum.pid || rm -f /var/run/yum.pid $(pgrep yum)
     - exec_in: echo "Cleaning old yum repodata."
-    - exec_in: yum clean all
+    - exec_in: yum clean all  -y
     - exec_in: yum history new
     - exec_in: truncate -c -s 0 /var/log/yum.log

data/templates/virtualbox/archlinux-x86_64.yaml

@@ -106,4 +106,3 @@ export:
     # - save_as_raw
     # - save_as_qcow2
     # - save_as_qed
-    # - save_as_vagrant_box

data/templates/virtualbox/centos6.5-vagrant-x86_64.yaml

@@ -0,0 +1,33 @@
+#==============================================================================
+# vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
+#==============================================================================
+#
+# DESCRIPTION: A standard Centos 6.5 vagrant base box (amd64)
+#
+#==============================================================================
+
+---
+extend: centos6.5-x86_64
+
+global:
+  ## User varibales : used by the recipe
+  user_name: vagrant
+
+#== Bootstrap the new system and create the 'in_context'
+bootstrap:
+  - "@base"
+
+#== Install and configuration steps
+setup:
+  - "@base"
+  - install_software:
+    - packages: >
+        gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel
+        openssl-devel readline-devel sqlite-devel perl wget dkms nfs-utils
+  - setup_vagrant_box
+
+#== Export the generated appliance in the format of your choice
+export:
+  - disable_checkpoint
+  - vagrant_save_appliance:
+    - output: "$$kameleon_cwd/$${kameleon_recipe_name}"

data/templates/virtualbox/centos6.5-x86_64.yaml

@@ -47,7 +47,10 @@ global:
     - $$distrib
     - "fedora"
 
-  disable_selinux: true
+  # SELinux configuration
+  selinux: permissive  ## Can take one of these three values: enforcing, permissive or disabled
+  selinuxtype: targeted  # Possible values are: strict, targeted
+
   ssh_config_file: $$kameleon_cwd/ssh_config
   out_context:
     cmd: ssh -F $$ssh_config_file $${kameleon_recipe_name} -t /bin/bash
@@ -55,32 +58,40 @@ global:
     proxy_cache: 10.0.2.2
 
   in_context:
-    cmd: ssh -F $$ssh_config_file $${kameleon_recipe_name} -t chroot $$rootfs /bin/bash
+    cmd: ssh -F $$ssh_config_file $${kameleon_recipe_name} -t /bin/bash
     workdir: /root/kameleon_workdir
     proxy_cache: 10.0.2.2
 
+#== Bootstrap the new system and create the 'in_context'
 bootstrap:
   - enable_checkpoint
   - prepare_virtualbox
   - start_virtualbox
   - install_requirements:
-    - packages: parted e2fsprogs yum rpm lynx
-  - initialize_disk:
+    - packages: parted e2fsprogs yum rpm lynx extlinux
+  - initialize_disk
   - yum_bootstrap:
     - mirror_packages_url: http://mirrors.kernel.org/$$distrib/$$release/os/$$arch/Packages/
-    - include_pkgs: findutils util-linux
-  - start_chroot
+    - include_pkgs: >
+        findutils yum util-linux dhclient vim-minimal net-tools openssh-server
+        kernel kernel-devel acpid
+  - switch_context_virtualbox
 
 #== Install and configuration steps
 setup:
   - configure_kernel
+  - configure_repo
   - update_system
   - minimal_install
   - install_software:
     - packages: >
-        kernel kernel-devel syslinux-extlinux bash-completion kbd dhclient 
-        sudo openssh-server openssh-clients ntp ntpdate dhclient
-        net-tools NetworkManager
+        syslinux-extlinux kbd sudo openssh-clients ntp ntpdate
+        rsync bridge-utils bzip2 cronie cronie-anacron crontabs
+        dash dhclient dhcp-common dracut dracut-kernel file fuse gnupg2
+        iptables-ipv6 libuser logrotate m4 openssh-server passwd
+        pciutils-libs rsyslog dbus system-config-firewall-base which
+        findutils yum util-linux vim-minimal net-tools openssh-server
+        kernel kernel-devel acpid
   - install_bootloader
   - configure_system:
     - locales: POSIX C en_US fr_FR de_DE
@@ -108,4 +119,3 @@ export:
     # - save_as_raw
     # - save_as_qcow2
     # - save_as_qed
-    # - save_as_vagrant_box

data/templates/virtualbox/centos7-x86_64.yaml

@@ -46,7 +46,10 @@ global:
     - $$distrib
     - "fedora"
 
-  disable_selinux: true
+  # SELinux configuration
+  selinux: permissive  ## Can take one of these three values: enforcing, permissive or disabled
+  selinuxtype: targeted  # Possible values are: strict, targeted
+
   ssh_config_file: $$kameleon_cwd/ssh_config
   out_context:
     cmd: ssh -F $$ssh_config_file $${kameleon_recipe_name} -t /bin/bash
@@ -113,4 +116,3 @@ export:
     # - save_as_raw
     # - save_as_qcow2
     # - save_as_qed
-    # - save_as_vagrant_box

data/templates/virtualbox/debian7-amd64.yaml

@@ -37,6 +37,7 @@ global:
   insecure_ssh_key_url: http://kameleon.imag.fr/iso/boot2debian/keys/insecure_id_rsa
 
   ## Rootfs options
+  disk_device: /dev/sda
   rootfs: /rootfs
   filesystem_type: ext4
 
@@ -58,7 +59,7 @@ global:
     proxy_cache: 10.0.2.2
 
   in_context:
-    cmd: ssh -F $$ssh_config_file $${kameleon_recipe_name} -t chroot $$rootfs /bin/bash
+    cmd: ssh -F $$ssh_config_file $${kameleon_recipe_name} -t /bin/bash
     workdir: /root/kameleon_workdir
     proxy_cache: 10.0.2.2
 
@@ -68,17 +69,18 @@ bootstrap:
   - prepare_virtualbox
   - start_virtualbox
   - install_requirements:
-    - packages: parted e2fsprogs debootstrap
-  - initialize_disk:
-    - disk_device: /dev/sda
+    - packages: parted e2fsprogs debootstrap extlinux
+  - initialize_disk
   - debootstrap:
-    - include_pkg: apt-utils ca-certificates locales less
+    - include_pkg: > 
+        apt-utils ca-certificates locales less linux-image-$$kernel_arch
+        isc-dhcp-client ifupdown iptables iputils-ping iproute pciutils
+        psmisc acpid acpi-support-base openssh-server sysvinit
     - release: $$release
     - arch: $$arch
     - repository: $$apt_repository
-    - enable_cache: true
     - variant: minbase
-  - start_chroot
+  - switch_context_virtualbox
 
 #== Install and configuration steps
 setup:
@@ -91,11 +93,8 @@ setup:
     - dist_upgrade: true
   - install_software:
     - packages: >
-        debian-keyring ntp sudo less vim bash-completion curl less acpid
-        linux-image-$$kernel_arch isc-dhcp-client isc-dhcp-common ifupdown
-        iptables iputils-ping iproute pciutils psmisc extlinux acpid 
-        acpi-support-base dialog htop tree openssh-server
-  - configure_kernel
+        debian-keyring ntp sudo less vim bash-completion curl less bzip2 wget 
+        dialog htop tree extlinux
   - install_bootloader
   # Configuration
   - configure_system:
@@ -126,4 +125,3 @@ export:
     # - save_as_raw
     # - save_as_qcow2
     # - save_as_qed
-    # - save_as_vagrant_box