openstack/training-labs
Code Issues Proposed changes

Change host-network subnets as per install-guides

Browse Source 
Change-Id: If1b531cc2e761729a953d160182b9c4b9886c9f1
This commit is contained in:
Pranav Salunke
2015-11-18 19:02:43 +01:00
parent 5cf647f0ad
commit 12293b9cf1
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
labs/osbash/config/config.compute
View File

@@ -4,7 +4,7 @@
VM_SSH_PORT=2232
# Last octet of IP addresses
FOURTH_OCTET=53
FOURTH_OCTET=31
# Assign network interfaces to networks
NET_IF_0=nat

2
labs/osbash/config/config.controller
View File

@@ -5,7 +5,7 @@ VM_SSH_PORT=2230
VM_WWW_PORT=8888
# Last octet of IP addresses
FOURTH_OCTET=51
FOURTH_OCTET=11
# Assign network interfaces to networks
NET_IF_0=nat

2
labs/osbash/config/config.network
View File

@@ -4,7 +4,7 @@
VM_SSH_PORT=2231
# Last octet of IP addresses
FOURTH_OCTET=52
FOURTH_OCTET=21
# Assign network interfaces to networks
NET_IF_0=nat

14
labs/osbash/config/hosts.multi
View File

@@ -1,9 +1,9 @@
10.10.10.51 controller-mgmt
192.168.100.51 controller-api
10.0.0.11 controller-mgmt
203.0.113.11 controller-api
10.10.10.52 network-mgmt
10.20.20.52 network-data
192.168.100.52 network-api
10.0.0.21 network-mgmt
10.0.1.21 network-data
203.0.113.21 network-api
10.10.10.53 compute-mgmt
10.20.20.53 compute-data
10.0.0.31 compute-mgmt
10.0.1.31 compute-data

22
labs/osbash/config/openstack
View File

@@ -1,5 +1,7 @@
# This file contains OpenStack configuration data. It is used by both
# host (osbash, Windows batch) and VM guest scripts.
# Follow install guides for more information on the network configuration:
# http://docs.openstack.org/kilo/install-guide/install/apt/content/ch_basic_environment.html#basics-networking
# one of: icehouse, juno, kilo
: ${OPENSTACK_RELEASE:=kilo}
@@ -8,22 +10,22 @@
CIRROS_URL="http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img"
# Networks used by OpenStack training-labs setup
: ${MGMT_NET:=10.10.10.1}
: ${DATA_NET:=10.20.20.1}
: ${API_NET:=192.168.100.1}
: ${MGMT_NET:=10.0.0.1}
: ${DATA_NET:=10.0.1.1}
: ${API_NET:=203.0.113.1}
# FIXME API_NET and EXT_NET should be different networks as soon as our
# setup allows it.
: ${EXT_NET:=192.168.100.1}
: ${EXT_NET:=203.0.113.1}
# EXT_NET
: ${FLOATING_IP_START:=192.168.100.101}
: ${FLOATING_IP_END:=192.168.100.200}
: ${EXTERNAL_NETWORK_GATEWAY:=192.168.100.1}
: ${EXTERNAL_NETWORK_CIDR:=192.168.100.0/24}
: ${FLOATING_IP_START:=203.0.113.101}
: ${FLOATING_IP_END:=203.0.113.200}
: ${EXTERNAL_NETWORK_GATEWAY:=203.0.113.1}
: ${EXTERNAL_NETWORK_CIDR:=203.0.113.0/24}
# DEMO_NET
: ${TENANT_NETWORK_GATEWAY:=172.16.0.1}
: ${TENANT_NETWORK_CIDR:=172.16.0.0/24}
: ${TENANT_NETWORK_GATEWAY:=192.168.1.1}
: ${TENANT_NETWORK_CIDR:=192.168.1.0/24}
# Comma-separated list of DNS name servers used by dnsmasq to serve instance
# VMs in neutron subnets with dns_nameservers unset.
# Default is Google Public DNS (8.8.8.8); to disable, set to "".