openstack
/
openstack-ansible-ops
Code Issues Proposed changes

make the default base network match variables.sh 

fix SSHKEY usage as is optional to run setup-host.sh

Change-Id: I61a0ddfd2fe0415912688742a03a51d9d9b391cc
This commit is contained in:
Matthew Thode 2017-05-22 14:49:40 -05:00
parent 325076bef6
commit 70c4538671
No known key found for this signature in database
GPG Key ID: 64A37BEAAE19A4E8
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multi-node-aio-xenial-ansible/build.sh
View File

@ -22,7 +22,7 @@ source functions.rc
# Provide defaults for unset variables
# Set first two octets of network used for containers, storage, etc
NETWORK_BASE=${NETWORK_BASE:-172.29}
NETWORK_BASE=${NETWORK_BASE:-10.29}
# Instruct the system do all of the require host setup
SETUP_HOST=${SETUP_HOST:-true}

2
multi-node-aio-xenial-ansible/deploy-osa.sh
View File

@ -23,7 +23,7 @@ source functions.rc
# Provide defaults for unset variables
# Set first two octets of network used for containers, storage, etc
NETWORK_BASE=${NETWORK_BASE:-172.29}
NETWORK_BASE=${NETWORK_BASE:-10.29}
# Reset the ssh-agent service to remove potential key issues
ssh_agent_reset

2
multi-node-aio-xenial-ansible/openstack-service-setup.sh
View File

@ -8,7 +8,7 @@ source openrc
# Provide defaults for unset variables
# Set first two octets of network used for containers, storage, etc
NETWORK_BASE=${NETWORK_BASE:-172.29}
NETWORK_BASE=${NETWORK_BASE:-10.29}
# Create base flavors for the new deployment
for flavor in micro tiny mini small medium large xlarge heavy; do

3
multi-node-aio-xenial-ansible/setup-pxeboot.sh
View File

@ -20,6 +20,9 @@ source functions.rc
# bring in variable definitions if there is a variables.sh file
[[ -f variables.sh ]] && source variables.sh
# set up ssh key in case setup-infra is not run
SSHKEY=${SSHKEY:-$(cat /root/.ssh/id_rsa.pub)}
# Use Ansible to install and configure a DHCP server, TFTP server and Apache
# so we can PXEboot all the VMs
ansible-playbook -v -i inventory create_pxeboot_server.yml --extra-vars \