From 550b2824cc53eb19511f53e0201c84c63fa2f0c2 Mon Sep 17 00:00:00 2001
From: Rick Box <rick.box@bbc.co.uk>
Date: Mon, 20 Feb 2017 16:03:32 +0000
Subject: [PATCH] Adds more values into variables.sh and places in extra
 scripts

More values have been added to the variables.sh file. None of these have
been adjusted from the default values but this now provides a standard
goto place to have all these values and be able to change with ease.

An include for varibles.sh is now also at the top of each of the script
files.

Change-Id: I2354c87e985115ce0b7f168ab1d056d5032e5cff
---
 multi-node-aio/deploy-vms.sh      |  3 +++
 multi-node-aio/setup-virsh-net.sh |  3 +++
 multi-node-aio/variables.sh       | 33 +++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/multi-node-aio/deploy-vms.sh b/multi-node-aio/deploy-vms.sh
index 8526d524..0fe9cb2a 100755
--- a/multi-node-aio/deploy-vms.sh
+++ b/multi-node-aio/deploy-vms.sh
@@ -17,6 +17,9 @@ set -eu
 # Load all functions
 source functions.rc
 
+# bring in variable definitions if there is a variables.sh file
+[[ -f variables.sh ]] && source variables.sh
+
 # Reset the ssh-agent service to remove potential key issues
 ssh_agent_reset
 
diff --git a/multi-node-aio/setup-virsh-net.sh b/multi-node-aio/setup-virsh-net.sh
index 83bdfdd1..2c5287df 100755
--- a/multi-node-aio/setup-virsh-net.sh
+++ b/multi-node-aio/setup-virsh-net.sh
@@ -17,6 +17,9 @@ set -eu
 # Load all functions
 source functions.rc
 
+# bring in variable definitions if there is a variables.sh file
+[[ -f variables.sh ]] && source variables.sh
+
 # Remove the default libvirt networks
 if virsh net-list |  grep -qw "default"; then
   virsh net-autostart default --disable
diff --git a/multi-node-aio/variables.sh b/multi-node-aio/variables.sh
index 5e258ffd..66368d6c 100755
--- a/multi-node-aio/variables.sh
+++ b/multi-node-aio/variables.sh
@@ -9,3 +9,36 @@ DNS_NAMESERVER=8.8.8.8
 # set up then this script will override these. This option allows for the override to be
 # disabled.
 OVERRIDE_SOURCES=true
+
+# What branch of Openstack-Ansible are we deploying from
+OSA_BRANCH=master
+
+# What is the default disk device name
+DEVICE_NAME=vda
+
+# What default network device should we use for Cobbler
+DEFAULT_NETWORK=eth0
+
+# What is the default virtual machine disk size in GB
+VM_DISK_SIZE=252
+
+# Do we want to do all the required host setup
+SETUP_HOST=true
+
+# Do we want to do disk partitioning or is there a partition ready to use
+PARTITION_HOST=true
+
+# Do we want to set up networking on the host for Virsh
+SETUP_VIRSH_NET=true
+
+# When the virtual machines are re-kicked do we format them
+VM_IMAGE_CREATE=true
+
+# Should we run the deploy Openstack-Ansible script at the end of the build script
+DEPLOY_OSA=true
+
+# Should we pre-configure the environment before we deploy OpenStack-Ansible
+PRE_CONFIG_OSA=true
+
+# Should we run the final deploy of OpenStack-Ansible
+RUN_OSA=true