kameleon-builder 2.1.3 → 2.2.0

data/templates/{debian7.yaml → qemu/debian7-amd64.yaml}

@@ -2,15 +2,17 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian 7 (Wheezy) base system
+# DESCRIPTION: Debian 7 (Wheezy) base system (amd64).
 #
 #==============================================================================
 
 ---
 # Loads some helpful aliases
 aliases: defaults.yaml
+
 # Enables qemu checkpoint
 checkpoint: qemu.yaml
+
 #== Global variables use by Kameleon engine and the steps
 global:
   ## User varibales : used by the recipe
@@ -21,24 +23,28 @@ global:
   distrib: debian
   release: wheezy
   arch: amd64
+  kernel_arch: $$arch
+  hostname: kameleon-$$distrib
 
   ## QEMU options
-  qemu_enable_kvm: true
+  qemu_enable_kvm: "$(egrep '(vmx|svm)' /proc/cpuinfo > /dev/null && echo true)"
   qemu_cpu: 2
-  qemu_memory_size: 512
-  qemu_monitor_port: 10023
+  qemu_memory_size: 768
+  qemu_monitor_socket: $$kameleon_cwd/qemu_monitor.socket
   qemu_ssh_port: 55423
   qemu_arch: x86_64
+  qemu_image_size: 10G
+  qemu_image_disk: $$kameleon_cwd/base_$$kameleon_recipe_name.qcow2
+  qemu_pidfile: $$kameleon_cwd/qemu.pid
 
-  ## Disk options
-  nbd_device: /dev/nbd1
-  image_disk: $$kameleon_cwd/base_$$kameleon_recipe_name.qcow2
-  image_size: 10G
-  filesystem_type: ext4
+  ## Kameleon iso bootstrap
+  boot2kameleon_url: http://kameleon.imag.fr/iso/boot2debian/debian-jessie-$${qemu_arch}-insecure.iso
+  insecure_ssh_key_url: http://kameleon.imag.fr/iso/boot2debian/keys/insecure_id_rsa
 
   # rootfs options
-  rootfs: $$kameleon_cwd/rootfs
-  rootfs_download_path: /var/cache/kameleon/$$distrib/$$release/$$arch/rootfs
+  disk_device: /dev/vda
+  rootfs: /rootfs
+  filesystem_type: ext4
 
   ## System variables. Required by kameleon engine
   # Include specific steps
@@ -52,53 +58,50 @@ global:
   apt_enable_nonfree: true
   apt_install_recommends: false
 
-  # Shell session from where we launch exec_out commands. There is often a
-  # local bash session, but it can be a remote shell on other machines or on
-  # any shell. (eg. bash, chroot, fakechroot, ssh, tmux, lxc...)
+  ssh_config_file: $$kameleon_cwd/ssh_config
   out_context:
-    cmd: bash
-    workdir: $$kameleon_cwd
+    cmd: ssh -F $$ssh_config_file $${kameleon_recipe_name} -t /bin/bash
+    workdir: /root/kameleon_workdir
+    proxy_cache: 10.0.2.2
 
-  # Shell session that allows us to connect to the building machine in order to
-  # configure it and setup additional programs
-  ssh_config_file: $$kameleon_cwd/ssh_config
   in_context:
-    cmd: LC_ALL=POSIX ssh -F $$ssh_config_file $$kameleon_recipe_name -t /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:
+  - prepare_qemu
+  - start_qemu
+  - enable_checkpoint
+  - install_requirements:
+    - packages: parted e2fsprogs debootstrap extlinux
+  - initialize_disk
   - debootstrap:
-    - include_pkg: >
-        ifupdown locales libui-dialog-perl dialog isc-dhcp-client netbase
-        net-tools iproute acpid openssh-server pciutils extlinux
-        linux-image-$$arch
+    - 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
-  - initialize_disk_qemu
-  - prepare_qemu
-  - install_bootloader
-  - start_qemu
+    - variant: minbase
+  - switch_context_qemu
 
 #== Install and configuration steps
-# WARNING: this part should be independante from the out context (whenever
-# possible...)
 setup:
   # Install
   - configure_apt:
     - repository: $$apt_repository
     - enable_contrib_repo: $$apt_enable_contrib
     - enable_nonfree_repo: $$apt_enable_nonfree
-    - install_recommends: $$apt_install_recommends
   - upgrade_system:
     - dist_upgrade: true
   - install_software:
     - packages: >
-        debian-keyring ntp rsync sudo less vim bash-completion
-  - configure_kernel:
-    - arch: $$arch
+        debian-keyring ntp sudo less vim bash-completion curl less bzip2 wget 
+        dialog htop tree extlinux
+  - install_bootloader
   # Configuration
   - configure_system:
     - locales: POSIX C en_US fr_FR de_DE
@@ -106,8 +109,7 @@ setup:
     - timezone: UTC
   - configure_keyboard:
     - layout: "us,fr,de"
-  - configure_network:
-    - hostname: kameleon-$$distrib
+  - configure_network
   - create_group:
     - name: admin
   - create_user:
@@ -117,12 +119,15 @@ setup:
 
 #== Export the generated appliance in the format of your choice
 export:
-  - save_appliance:
-    - input: $$image_disk
+  - disable_checkpoint
+  - qemu_save_appliance:
+    - input: $$qemu_image_disk
     - output: $$kameleon_cwd/$$kameleon_recipe_name
     - save_as_qcow2
     # - save_as_qed
-    # - save_as_tgz
+    # - save_as_tar_gz
+    # - save_as_tar_xz
+    # - save_as_tar_bz2
     # - save_as_raw
     # - save_as_vmdk
     # - save_as_vdi

data/templates/{debian7-desktop.yaml → qemu/debian7-desktop-amd64.yaml}

@@ -2,16 +2,15 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian 7 (Wheezy) GNOME Desktop edition.
+# DESCRIPTION: Debian 7 (Wheezy) GNOME Desktop edition (amd64).
 #
 #==============================================================================
 
 ---
-extend: debian7
+extend: debian7-amd64
 
 global:
   # Apt options
-  apt_install_recommends: true
 
 bootstrap:
   - @base

data/templates/{debian7-kameleon.yaml → qemu/debian7-kameleon-amd64.yaml}

@@ -2,12 +2,12 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian 7 appliance with kameleon.
+# DESCRIPTION: Debian 7 appliance with kameleon (amd64).
 #
 #==============================================================================
 
 ---
-extend: debian7-desktop
+extend: debian7-desktop-amd64
 
 global:
   # You can see the base template `debian7-desktop.yaml` to know the
@@ -37,7 +37,4 @@ setup:
           rm -f /bigemptyfile
 
 export:
-  - save_appliance:
-    - save_as_qcow2:
-      - exec_out: qemu-img convert -c -O qcow2 $$image_disk $KAMELEON_WORKDIR/$$kameleon_recipe_name.qcow2
-      - exec_out: echo "Saved qcow2 appliance to $KAMELEON_WORKDIR/$$kameleon_recipe_name.qcow2"
+  - @base

data/templates/{debian7-oar-dev.yaml → qemu/debian7-oar-amd64.yaml}

@@ -2,12 +2,12 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian 7 dev appliance with OAR-2.5 (node/server/frontend).
+# DESCRIPTION: Debian 7 dev appliance with OAR-2.5 (amd64).
 #
 #==============================================================================
 
 ---
-extend: debian7
+extend: debian7-amd64
 
 global:
   distrib: debian

data/templates/qemu/debian8-amd64.yaml

@@ -0,0 +1,25 @@
+#==============================================================================
+# vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
+#==============================================================================
+#
+# DESCRIPTION: Debian 8 (Jessie) base system (amd64).
+#
+#==============================================================================
+
+---
+extend: debian7-amd64
+
+global:
+  # Distribution
+  distrib: debian
+  release: jessie
+  arch: amd64
+
+bootstrap:
+  - @base
+
+setup:
+  - @base
+
+export:
+  - @base

data/templates/{fedora20-desktop.yaml → qemu/fedora20-desktop-x86_64.yaml}

@@ -2,12 +2,12 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Fedora 20 GNOME Desktop edition
+# DESCRIPTION: Fedora 20 GNOME Desktop edition (x86_64).
 #
 #==============================================================================
 
 ---
-extend: fedora20
+extend: fedora20-x86_64
 
 bootstrap:
   - @base

data/templates/qemu/fedora20-x86_64.yaml

@@ -0,0 +1,116 @@
+#==============================================================================
+# vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
+#==============================================================================
+#
+# DESCRIPTION: Fedora 20 base system (x86_64).
+#
+#==============================================================================
+
+---
+# Loads some helpful aliases
+aliases: defaults.yaml
+# Enables qemu checkpoint
+checkpoint: qemu.yaml
+#== Global variables use by Kameleon engine and the steps
+global:
+  ## User varibales : used by the recipe
+  user_name: kameleon
+  user_password: $$user_name
+
+  # Distribution
+  distrib: fedora
+  release: 20
+  arch: x86_64
+  hostname: kameleon-$$distrib
+
+  ## QEMU options
+  qemu_enable_kvm: "$(egrep '(vmx|svm)' /proc/cpuinfo > /dev/null && echo true)"
+  qemu_cpu: 2
+  qemu_memory_size: 768
+  qemu_monitor_socket: $$kameleon_cwd/qemu_monitor.socket
+  qemu_ssh_port: 55423
+  qemu_arch: x86_64
+  qemu_image_size: 10G
+  qemu_image_disk: $$kameleon_cwd/base_$$kameleon_recipe_name.qcow2
+  qemu_pidfile: $$kameleon_cwd/qemu.pid
+
+  ## Kameleon iso bootstrap
+  boot2kameleon_url: http://kameleon.imag.fr/iso/boot2debian/debian-jessie-$${qemu_arch}-insecure.iso
+  insecure_ssh_key_url: http://kameleon.imag.fr/iso/boot2debian/keys/insecure_id_rsa
+
+  # rootfs options
+  disk_device: /dev/vda
+  rootfs: /rootfs
+  filesystem_type: ext4
+
+  ## System variables. Required by kameleon engine
+  # Include specific steps
+  include_steps:
+    - $$distrib/$$release
+    - $$distrib
+
+  disable_selinux: true
+  ssh_config_file: $$kameleon_cwd/ssh_config
+  out_context:
+    cmd: ssh -F $$ssh_config_file $${kameleon_recipe_name} -t /bin/bash
+    workdir: /root/kameleon_workdir
+    proxy_cache: 10.0.2.2
+
+  in_context:
+    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_qemu
+  - start_qemu
+  - install_requirements:
+    - packages: parted e2fsprogs yum rpm lynx extlinux
+  - initialize_disk
+  - yum_bootstrap:
+    - mirror_packages_url: http://mirrors.kernel.org/fedora/releases/$$release/Fedora/$$arch/os/Packages/f/
+    - include_pkgs: >
+        findutils yum util-linux dhclient vim-minimal net-tools NetworkManager
+        openssh-server
+  - init_pxeboot:
+    - pxe_initrd_url: http://mirrors.kernel.org/fedora/releases/$$release/Fedora/$$arch/os/images/pxeboot/initrd.img
+    - pxe_vmlinuz_url: http://mirrors.kernel.org/fedora/releases/$$release/Fedora/$$arch/os/images/pxeboot/vmlinuz
+  - switch_context_qemu
+
+#== Install and configuration steps
+setup:
+  - configure_kernel
+  - update_system
+  - minimal_install
+  - install_software:
+    - packages: >
+        kernel bash-completion kbd sudo openssh-clients syslinux-extlinux acpid
+        ntp ntpdate
+  - install_bootloader
+  - configure_system:
+    - locales: POSIX C en_US fr_FR de_DE
+    - lang: en_US.UTF-8
+    - timezone: UTC
+  - configure_keyboard:
+    - layout: "us"
+  - configure_network:
+    - hostname: kameleon-$$distrib
+  - create_user:
+    - name: $$user_name
+    - groups: wheel
+    - password: $$user_password
+
+#== Export the generated appliance in the format of your choice
+export:
+  - disable_checkpoint
+  - qemu_save_appliance:
+    - input: $$qemu_image_disk
+    - output: $$kameleon_cwd/$$kameleon_recipe_name
+    - save_as_qcow2
+    # - save_as_qed
+    # - save_as_tgz
+    # - save_as_raw
+    # - save_as_vmdk
+    # - save_as_vdi

data/templates/{ubuntu-12.04.yaml → qemu/ubuntu-12.04-amd64.yaml}

@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Ubuntu 12.04 LTS (Precise Pangolin) base system.
+# DESCRIPTION: Ubuntu 12.04 LTS (Precise Pangolin) base system (amd64).
 #
 #==============================================================================
 
@@ -21,29 +21,35 @@ global:
   distrib: ubuntu
   release: precise
   arch: amd64
+  kernel_arch: $$arch
+  hostname: kameleon-$$distrib
 
   ## QEMU options
-  qemu_enable_kvm: true
+  qemu_enable_kvm: "$(egrep '(vmx|svm)' /proc/cpuinfo > /dev/null && echo true)"
   qemu_cpu: 2
-  qemu_memory_size: 512
-  qemu_monitor_port: 10023
+  qemu_memory_size: 768
+  qemu_monitor_socket: $$kameleon_cwd/qemu_monitor.socket
   qemu_ssh_port: 55423
   qemu_arch: x86_64
+  qemu_image_size: 10G
+  qemu_image_disk: $$kameleon_cwd/base_$$kameleon_recipe_name.qcow2
+  qemu_pidfile: $$kameleon_cwd/qemu.pid
 
-  ## Disk options
-  nbd_device: /dev/nbd1
-  image_disk: $$kameleon_cwd/base_$$kameleon_recipe_name.qcow2
-  image_size: 10G
+  ## Kameleon iso bootstrap
+  boot2kameleon_url: http://kameleon.imag.fr/iso/boot2debian/debian-jessie-$${qemu_arch}-insecure.iso
+  insecure_ssh_key_url: http://kameleon.imag.fr/iso/boot2debian/keys/insecure_id_rsa
+
+  # rootfs options
+  disk_device: /dev/vda
+  rootfs: /rootfs
   filesystem_type: ext4
 
   # rootfs options
-  rootfs: $$kameleon_cwd/rootfs
-  rootfs_download_path: /var/cache/kameleon/$$distrib/$$release/$$arch/rootfs
+  rootfs: /rootfs
 
   # Apt options
   apt_repository: http://archive.ubuntu.com/ubuntu/
   apt_enable_restricted: true
-  apt_install_recommends: false
 
   ## System variables. Required by kameleon engine
   # Include specific steps
@@ -52,52 +58,51 @@ global:
     - $$distrib
     - debian
 
-  # Shell session from where we launch exec_out commands. There is often a
-  # local bash session, but it can be a remote shell on other machines or on
-  # any shell. (eg. bash, chroot, fakechroot, ssh, tmux, lxc...)
+  ssh_config_file: $$kameleon_cwd/ssh_config
   out_context:
-    cmd: bash
-    workdir: $$kameleon_cwd
+    cmd: ssh -F $$ssh_config_file $${kameleon_recipe_name} -t /bin/bash
+    workdir: /root/kameleon_workdir
+    proxy_cache: 10.0.2.2
 
-  # Shell session that allows us to connect to the building machine in order to
-  # configure it and setup additional programs
-  ssh_config_file: $$kameleon_cwd/ssh_config
   in_context:
-    cmd: ssh -F $$ssh_config_file $$kameleon_recipe_name -t /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:
+  - prepare_qemu
+  - start_qemu
+  - install_requirements:
+    - packages: parted e2fsprogs debootstrap extlinux
+  - enable_checkpoint
+  - initialize_disk
   - debootstrap:
-    - include_pkg: >
-        acpi-support kbd udev linux-image-virtual locales openssh-server
-        bzip2 linux-image-generic
+    - include_pkg: > 
+        apt-transport-https ca-certificates less acpid acpi-support kbd bzip2 udev
+        locales psmisc linux-image-generic ifupdown iptables iputils-ping
+        iproute pciutils isc-dhcp-client openssh-server
     - release: $$release
     - arch: $$arch
     - repository: $$apt_repository
-    - enable_cache: true
-  - initialize_disk_qemu
-  - prepare_qemu
-  - install_bootloader
-  - start_qemu
+    - variant: minbase
+  - switch_context_qemu
+
 
 #== Install and configuration steps
-# WARNING: this part should be independante from the out context (whenever
-# possible...)
 setup:
   # Install
   - configure_apt:
     - repository: $$apt_repository
     - enable_restricted: $$apt_enable_restricted
-    - install_recommends: $$apt_install_recommends
   - upgrade_system:
     - dist_upgrade: true
   - install_software:
     - packages: >
-        apt-transport-https ca-certificates rsync sudo less bash-completion
-        curl nano vim psmisc language-pack-en
+        bash-completion curl nano vim language-pack-en extlinux sudo
   - configure_kernel:
     - arch: $$arch
+  - install_bootloader
   # Configuration
   - configure_system:
     - locales: POSIX C en_US fr_FR de_DE
@@ -105,8 +110,7 @@ setup:
     - timezone: UTC
   - configure_keyboard:
     - layout: "us,fr,de"
-  - configure_network:
-    - hostname: kameleon-$$distrib
+  - configure_network
   - create_group:
     - name: admin
   - create_user:
@@ -116,8 +120,9 @@ setup:
 
 #== Export the generated appliance in the format of your choice
 export:
-  - save_appliance:
-    - input: $$image_disk
+  - disable_checkpoint
+  - qemu_save_appliance:
+    - input: $$qemu_image_disk
     - output: $$kameleon_cwd/$$kameleon_recipe_name
     - save_as_qcow2
     # - save_as_qed
@@ -125,4 +130,3 @@ export:
     # - save_as_raw
     # - save_as_vmdk
     # - save_as_vdi
-