Move everything 'common' into base, making it avoidable for tests.

Change-Id: I87edd00f6e0edcd609856192c2c98604ef3274f0

elements/base/install.d/00-baseline-environment

@@ -0,0 +1,6 @@
+#!/bin/bash
+# These are useful, or at worst not harmful, for all imges we build.
+
+set -e
+
+apt-get -y install linux-image-generic vlan open-iscsi

elements/base/pre-install.d/00-baseline-tools

@@ -0,0 +1,8 @@
+#!/bin/bash
+# Install baseline packages and tools.
+
+set -e
+
+apt-get -y update
+apt-get -y install python-software-properties
+add-apt-repository -y ppa:tripleo/demo

elements/base/pre-install.d/99-apt-get-update

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Do an apt-get update, so that packages can be installed.
+
+set -e
+
+apt-get -y update

elements/tripleo-staging/README.md

@@ -0,0 +1,4 @@
+Adds the tripleo demo staging repository.
+
+This is used when testing builds of new plumbing (such as qemu-kvm). Most folk
+should not need it.

elements/tripleo-staging/pre-install.d/01-bleeding-edge

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Install bleeding edge tools instead of stable ones.
+
+set -e
+
+add-apt-repository -y ppa:tripleo/demo-staging

lib/img-functions

@@ -216,20 +216,11 @@ function unblock_daemons () {
 function do_pre_install () {
   block_daemons
   block_apt_translations
-  # Install baseline packages and tools
-  run_in_target apt-get -y update
-  run_in_target apt-get -y install python-software-properties
-  run_in_target add-apt-repository -y ppa:tripleo/demo
-  # Uncomment to get the bleeding edge - this should be an element thing.
-  # run_in_target add-apt-repository -y ppa:tripleo/demo-staging
   # Run pre-install scripts. These do things that prepare the chroot for package installs
   run_d_in_target pre-install
-  run_in_target apt-get -y update
 }
 
 function do_install () {
-  # These are useful, or at worst not harmful, for all imges we build.
-  run_in_target apt-get -y install linux-image-generic vlan open-iscsi
   # Call install scripts to pull in the software users want.
   run_d_in_target install
   unblock_daemons