From 45fe44f9247bcff6699f8e3b6bdf0b137bc51af3 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Thu, 7 Jan 2016 19:05:48 +0800
Subject: [PATCH] Add debian-jessie image to nodepool

This patch adds Debian Jessie diskimage-builder image to nodepool.
debian-packageinstall element is based on debian-minimal and provides
additional required packages, change is introduced in
I9486b1356eac74272e79655c9024d86ee486628c

Depends-On: Ic39ba2b5ceb5018efb75742547b2babf80827e56
Depends-On: I7a661c8b5d4bb632eb32b5018c55474c1c66a4e8
Depends-On: I4a5a8352388de46e9e7713fa11951fcde27eaad9
Change-Id: I851cb47e844a72a430b578dd63d8b230ee6e3ed9
Co-Authored-By: Igor Belikov <ibelikov@mirantis.com>
---
 nodepool/nodepool.yaml               | 26 ++++++++++++++++++++++++++
 nodepool/scripts/configure_mirror.sh | 14 ++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 63581b568b..573c948501 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -28,6 +28,16 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
+  - name: debian-jessie
+    image: debian-jessie
+    ready-script: configure_mirror.sh
+    min-ready: 1
+    providers:
+      - name: ovh-gra1
+      - name: ovh-bhs1
+      - name: rax-dfw
+      - name: rax-ord
+      - name: rax-iad
   - name: devstack-trusty
     image: devstack-trusty
     ready-script: configure_mirror.sh
@@ -446,6 +456,22 @@ targets:
   - name: jenkins07
 
 diskimages:
+  - name: debian-jessie
+    elements:
+      - debian-minimal
+      - vm
+      - simple-init
+      - openstack-repos
+      - nodepool-base
+      - node-devstack
+      - cache-bindep
+      - growroot
+    release: jessie
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_APT_LOCAL_CACHE: '0'
+      DIB_DISABLE_APT_CLEANUP: '1'
   - name: ubuntu-trusty
     elements:
       - ubuntu-minimal
diff --git a/nodepool/scripts/configure_mirror.sh b/nodepool/scripts/configure_mirror.sh
index 6f46419a8d..2c22bba814 100755
--- a/nodepool/scripts/configure_mirror.sh
+++ b/nodepool/scripts/configure_mirror.sh
@@ -64,4 +64,18 @@ EOF
     sudo dd of=/etc/apt/apt.conf.d/99unauthenticated <<EOF
 APT::Get::AllowUnauthenticated "true";
 EOF
+elif [ "$LSBDISTID" == "Debian" ] ; then
+sudo dd of=/etc/apt/sources.list <<EOF
+deb http://httpredir.debian.org/debian $LSBDISTCODENAME main
+deb-src http://httpredir.debian.org/debian $LSBDISTCODENAME main
+
+deb http://httpredir.debian.org/debian $LSBDISTCODENAME-updates main
+deb-src http://httpredir.debian.org/debian $LSBDISTCODENAME-updates main
+
+deb http://security.debian.org/ $LSBDISTCODENAME/updates main
+deb-src http://security.debian.org/ $LSBDISTCODENAME/updates main
+
+deb http://httpredir.debian.org/debian $LSBDISTCODENAME-backports main
+deb-src http://httpredir.debian.org/debian $LSBDISTCODENAME-backports main
+EOF
 fi