openstack/openstack-ansible-ops
Code Issues Proposed changes

Merge "Adds more values into variables.sh and places in extra scripts"

Browse Source
This commit is contained in:
Jenkins 2017-02-20 19:57:54 +00:00 committed by Gerrit Code Review
commit 90d1757eaf
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multi-node-aio/deploy-vms.sh
View File

@ -17,6 +17,9 @@ set -eu
# Load all functions # Load all functions
source functions.rc 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 # Reset the ssh-agent service to remove potential key issues
ssh_agent_reset ssh_agent_reset

3
multi-node-aio/setup-virsh-net.sh
View File

@ -17,6 +17,9 @@ set -eu
# Load all functions # Load all functions
source functions.rc 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 # Remove the default libvirt networks
if virsh net-list | grep -qw "default"; then if virsh net-list | grep -qw "default"; then
virsh net-autostart default --disable virsh net-autostart default --disable

33
multi-node-aio/variables.sh
View File

@ -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 # set up then this script will override these. This option allows for the override to be
# disabled. # disabled.
OVERRIDE_SOURCES=true 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