kameleon-builder 2.1.3 → 2.2.0

data/templates/{docker-debian7.yaml → docker/debian7.yaml}

@@ -28,7 +28,7 @@ global:
   docker_hostname: $$kameleon_recipe_name
 
   # rootfs options
-  rootfs_download_path: /var/cache/kameleon/$$distrib/$$release/$$arch/rootfs
+  rootfs: $$kameleon_cwd/rootfs
 
   ## System variables. Required by kameleon engine
   # Include specific steps
@@ -40,7 +40,6 @@ global:
   apt_repository: http://ftp.debian.org/debian/
   apt_enable_contrib: true
   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
@@ -48,6 +47,7 @@ global:
   out_context:
     cmd: bash
     workdir: $$kameleon_cwd
+    proxy_cache: localhost
 
   # Shell session that allows us to connect to the building machine in order to
   # configure it and setup additional programs
@@ -55,6 +55,7 @@ global:
   in_context:
     cmd: LC_ALL=POSIX ssh -F $$ssh_config_file $$kameleon_recipe_name -t /bin/bash
     workdir: /root/kameleon_workdir
+    proxy_cache: 172.17.42.1
 
 #== Bootstrap the new system and create the 'in_context'
 bootstrap:
@@ -66,7 +67,7 @@ bootstrap:
     - release: $$release
     - arch: $$arch
     - repository: $$apt_repository
-    - enable_cache: true
+    - variant: minbase
   - prepare_docker
   - start_docker
 
@@ -80,7 +81,6 @@ setup:
     - 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:
@@ -104,4 +104,4 @@ setup:
 export:
   - save_docker_appliance:
     - commit:
-      - exec_out: docker commit $(cat MAIN_CONTAINER_ID) -t $$kameleon_recipe_name:latest
+      - exec_out: docker commit $(cat MAIN_CONTAINER_ID) $$kameleon_recipe_name:latest

data/templates/extend.erb

@@ -7,10 +7,10 @@
 #==============================================================================
 
 ---
-extend: <%= @name %>
+extend: <%= tpl.relative_path %>
 
 global:
-    # You can see the base template `<%= @name %>.yaml` to know the
+    # You can see the base template `<%= tpl.relative_path %>.yaml` to know the
     # variables that you can override
 
 bootstrap:

data/templates/{debian7-g5k.yaml → grid5000/debian7.yaml}

@@ -67,7 +67,7 @@ setup:
   - configure_apt:
     - enable_contrib_repo: true
     - enable_nonfree_repo: true
-    - install_recommends: false
+    
   - upgrade_system:
     - dist_upgrade: true
   - install_software:

data/templates/{archlinux-desktop.yaml → qemu/archlinux-desktop-i686.yaml}

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

data/templates/qemu/archlinux-desktop-x86_64.yaml

@@ -0,0 +1,25 @@
+#==============================================================================
+# vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
+#==============================================================================
+#
+# DESCRIPTION: Archlinux GNOME Desktop edition (x86_64).
+#
+#==============================================================================
+
+---
+extend: archlinux-x86_64
+
+bootstrap:
+  - @base
+
+setup:
+  - @base
+  - install_yaourt
+  - install_gnome:
+    - keyboard_layout: en
+    - extra_packages: >
+        firefox-i18n-en-us flashplugin libreoffice libreoffice-en-US telepathy
+        hunspell-en faenza-icon-theme file-roller
+
+export:
+  - @base

data/templates/qemu/archlinux-i686.yaml

@@ -0,0 +1,25 @@
+#==============================================================================
+# vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
+#==============================================================================
+#
+# DESCRIPTION: Archlinux base system system (i686).
+#
+#==============================================================================
+
+---
+extend: archlinux-x86_64
+
+#== Global variables use by Kameleon engine and the steps
+global:
+  # Distribution
+  arch: i686
+  qemu_arch: i386
+
+bootstrap:
+  - @base
+
+setup:
+  - @base
+
+export:
+  - @base

data/templates/{archlinux.yaml → qemu/archlinux-x86_64.yaml}

@@ -2,14 +2,14 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Build an Archlinux base system system.
+# DESCRIPTION: Build an Archlinux base system system (x86_64).
 #
 #==============================================================================
 
 ---
 # Loads some helpful aliases
 aliases: defaults.yaml
-# Enables qcow2 checkpoint
+# Enables qemu checkpoint
 checkpoint: qemu.yaml
 #== Global variables use by Kameleon engine and the steps
 global:
@@ -20,56 +20,58 @@ global:
   # Distribution
   distrib: archlinux
   arch: x86_64
-
-  ## Disk options
-  nbd_device: /dev/nbd1
-  image_disk: $$kameleon_cwd/base_$$kameleon_recipe_name.qcow2
-  image_size: 10G
-  filesystem_type: ext4
+  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_arch: $$arch
+  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-$${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/$$arch/rootfs
+  rootfs: /rootfs
+  filesystem_type: ext4
 
   ## System variables. Required by kameleon engine
   # Include specific steps
   include_steps:
     - $$distrib
 
-  # 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 chroot $$rootfs /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 wget
+  - enable_checkpoint
+  - initialize_disk:
+    - disk_device: /dev/vda
   - arch_bootstrap:
     - mirror: http://mir.archlinux.fr/
     # You can choose any group from https://www.archlinux.org/groups/
     # It's recommended to use 'base' (default) or 'base-devel' (with dev tools)
     - pkg_group: base
-  - initialize_disk_qemu
-  - prepare_qemu
-  - install_bootloader
-  - start_qemu
+  - start_chroot
 
 #== Install and configuration steps
 # WARNING: this part should be independante from the out context (whenever
@@ -77,17 +79,17 @@ bootstrap:
 setup:
   # Install
   - install_software:
-    - packages: ntp zip unzip rsync sudo vim bash-completion
+    - packages: ntp zip unzip rsync sudo vim bash-completion syslinux
+  - install_bootloader
   # Configuration
   - configure_system:
     - locales: POSIX C en_US fr_FR de_DE
     - lang: en_US.UTF-8
     - timezone: UTC
   - configure_keyboard:
-    # set to french keyboard use 'localectl list-keymaps' to see available list
+    # set to english keyboard use 'localectl list-keymaps' to see available list
     - layout: en
-  - configure_network:
-    - hostname: kameleon-$$distrib
+  - configure_network
   - create_user:
     - name: $$user_name
     - groups: wheel
@@ -95,8 +97,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

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

@@ -0,0 +1,113 @@
+#==============================================================================
+# vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
+#==============================================================================
+#
+# DESCRIPTION: Centos 6.5 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: centos
+  release: 6.5
+  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
+    - "fedora"
+
+  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 chroot $$rootfs /bin/bash
+    workdir: /root/kameleon_workdir
+    proxy_cache: 10.0.2.2
+
+bootstrap:
+  - enable_checkpoint
+  - prepare_qemu
+  - start_qemu
+  - install_requirements:
+    - packages: parted e2fsprogs yum rpm lynx
+  - initialize_disk:
+  - yum_bootstrap:
+    - mirror_packages_url: http://mirrors.kernel.org/$$distrib/$$release/os/$$arch/Packages/
+    - include_pkgs: findutils util-linux
+  - start_chroot
+
+#== Install and configuration steps
+setup:
+  - configure_kernel
+  - 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
+  - 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
+  - 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_tar_gz
+    # - save_as_tar_xz
+    # - save_as_tar_bz2
+    # - save_as_raw
+    # - save_as_vmdk
+    # - save_as_vdi

data/templates/qemu/centos7-x86_64.yaml

@@ -0,0 +1,119 @@
+#==============================================================================
+# vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
+#==============================================================================
+#
+# DESCRIPTION: Centos 7 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: centos
+  release: 7
+  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
+    - "fedora"
+
+  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/$$distrib/$$release/os/$$arch/Packages/
+    - include_pkgs: >
+        findutils yum util-linux dhclient vim-minimal net-tools NetworkManager
+        openssh-server
+  - init_pxeboot:
+    - pxe_initrd_url: http://mirrors.kernel.org/$$distrib/$$release/os/$$arch/images/pxeboot/initrd.img
+    - pxe_vmlinuz_url: http://mirrors.kernel.org/$$distrib/$$release/os/$$arch/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_tar_gz
+    # - save_as_tar_xz
+    # - save_as_tar_bz2
+    # - save_as_raw
+    # - save_as_vmdk
+    # - save_as_vdi