Merge pull request redhat-openstack#34 from GregSutcliffe/master

Network related changes

README.md

@@ -12,10 +12,16 @@ Prerequisites:
 RHEL 6.4
  * This *should* work on other operating systems, but has only been tested on RHEL6.4
 
+Network layout
+ * Each machine has a public and a private network interface (i.e eth0 & eth1)
+ * Network gateway is at $(NETWORK).1
+
 At least 3 machines
- * 1 Foreman Host
- * 1 OpenStack Controller Node
- * 1+ OpenStack Compute Nodes 
+ * 1 Foreman Host (private address $(NETWORK).2 )
+ * 1 OpenStack Controller Node (private address $(NETWORK.3 )
+ * 1+ OpenStack Compute Nodes
+
+Ipaddress defaults can be changed in the class parameters
 
 Preconfiguration - these machines should be:
  * Running RHEL 6.4

bin/foreman_server.sh

@@ -48,14 +48,15 @@ if [ ! -f /etc/redhat-release ] || \
 fi
 
 if [ "$FOREMAN_PROVISIONING" = "true" ]; then
- NUM_INT=$(scl enable ruby193 "facter -p"|grep ipaddress_|grep -v _lo|wc -l) 
- if [[ $NUM_INT -lt 2 ]] ; then 
- echo "This installer needs 2 configured interfaces - only $NUM_INT detected" 
- exit 1 
- fi 
- PRIMARY_INT=$(route|grep default|awk ' { print ( $(NF) ) }') 
+ NUM_INT=$(scl enable ruby193 "facter -p"|grep ipaddress_|grep -v _lo|wc -l)
+ if [[ $NUM_INT -lt 2 ]] ; then
+ echo "This installer needs 2 configured interfaces - only $NUM_INT detected"
+ exit 1
+ fi
+ PRIMARY_INT=$(route|grep default|awk ' { print ( $(NF) ) }')
+ PRIMARY_PREFIX=$(scl enable ruby193 "facter network_${PRIMARY_INT}" | cut -d. -f1-3)
  SECONDARY_INT=$(scl enable ruby193 "facter -p"|grep ipaddress_|grep -Ev "_lo|$PRIMARY_INT"|awk -F"[_ ]" '{print $2;exit 0}')
- SECONDARY_PREFIX=$(scl enable ruby193 "facter network_${SECONDARY_INT}" | cut -d. -f1-3) # -> 10.0.0 -> '0.0.10.in-addr.arpa',
+ SECONDARY_PREFIX=$(scl enable ruby193 "facter network_${SECONDARY_INT}" | cut -d. -f1-3)
  SECONDARY_REVERSE=$(echo "$SECONDARY_PREFIX" | ( IFS='.' read a b c ; echo "$c.$b.$a.in-addr.arpa" ))
  FORWARDER=$(augtool get /files/etc/resolv.conf/nameserver[1] | awk '{printf $NF}')
 fi
@@ -108,7 +109,7 @@ EOM
 if [ "$FOREMAN_PROVISIONING" = "true" ]; then
 cat >> installer.pp << EOM
  dhcp => true,
- dhcp_gateway => '${SECONDARY_PREFIX}.1',
+ dhcp_gateway => false,
  dhcp_range => '${SECONDARY_PREFIX}.50 ${SECONDARY_PREFIX}.200',
  dhcp_interface => '${SECONDARY_INT}',
 
@@ -126,7 +127,7 @@ cat >> installer.pp << EOM
  tftp => false,
 }
 EOM
- 
+
 fi
 
 scl enable ruby193 "puppet apply --verbose installer.pp --modulepath=. "
@@ -156,6 +157,8 @@ done
 
 sed -i "s/PRIMARY/$PRIMARY_INT/" ../puppet/modules/trystack/manifests/params.pp
 sed -i "s/SECONDARY/$SECONDARY_INT/" ../puppet/modules/trystack/manifests/params.pp
+sed -i "s/PUB_IP/${PRIMARY_PREFIX}.3/" ../puppet/modules/trystack/manifests/params.pp
+sed -i "s/PRIV_IP/${SECONDARY_PREFIX}.3/" ../puppet/modules/trystack/manifests/params.pp
 
 # install puppet modules
 mkdir -p $SCL_RUBY_HOME/etc/puppet/environments/production/modules

installer_puppet/dhcp/manifests/pool.pp

@@ -2,7 +2,7 @@
  $network,
  $mask,
  $range = false,
- $gateway
+ $gateway = false
  ) {
 
  include dhcp::params

installer_puppet/dhcp/templates/dhcpd.pool.erb

@@ -10,6 +10,8 @@ subnet <%= network %> netmask <%= mask %> {
 <% end -%>
 
  option subnet-mask <%= mask %>;
+<% if gateway -%>
  option routers <%= gateway %>;
+<% end -%>
 }
 

installer_puppet/puppet/manifests/cron.pp

@@ -6,7 +6,7 @@
  }
 
  cron { 'puppet':
- command => "/usr/bin/env puppet agent --config ${puppet::dir}/puppet.conf --onetime --no-daemonize",
+ command => "/usr/bin/env scl enable ruby193 \"puppet agent --config /opt/rh/ruby193/root/etc/puppet/puppet.conf --onetime --no-daemonize\""
  user => root,
  minute => ip_to_cron($puppet::cron_interval, $puppet::cron_range),
  }

puppet/trystack/manifests/params.pp

@@ -16,13 +16,13 @@
  $nova_db_password = 'CHANGEME'
  $nova_user_password = 'CHANGEME'
 
- # Networking
+ # Networking - we're assuming /24 ranges, but the user can always override
  $public_interface = 'PRIMARY'
  $private_interface = 'SECONDARY'
- $fixed_network_range = inline_template("<%= scope.lookupvar('::network_${private_interface}') + '/' + scope.lookupvar('::netmask_${private_interface}') %>")
- $floating_network_range = inline_template("<%= scope.lookupvar('::network_${public_interface}') + '/' + scope.lookupvar('::netmask_${public_interface}') %>")
- $pacemaker_priv_floating_ip = inline_template("<%= scope.lookupvar('::ipaddress_${private_interface}') %>")
- $pacemaker_pub_floating_ip = inline_template("<%= scope.lookupvar('::ipaddress_${public_interface}') %>")
+ $fixed_network_range = inline_template("<%= scope.lookupvar('::network_${private_interface}') + '/24' %>")
+ $floating_network_range = inline_template("<%= scope.lookupvar('::network_${public_interface}') + '/24' %>")
+ $pacemaker_priv_floating_ip = 'PRIV_IP'
+ $pacemaker_pub_floating_ip = 'PUB_IP'
 
  # Logs
  $admin_email = "admin@${::domain}"