Merge pull request redhat-openstack#43 from cwolferh/nic_fix

fix what interface we derive values from when setting up a subnet.

bin/foreman_server.sh

@@ -217,6 +217,7 @@ echo ":dns_provider: nsupdate" >> /opt/rh/ruby193/root/etc/foreman-proxy/setting
 
 # Set params, and run the db:seed file
 cp ./seeds.rb $FOREMAN_DIR/db/.
+sed -i "s#SECONDARY_INT#$SECONDARY_INT#" $FOREMAN_DIR/db/seeds.rb
 sed -i "s#PRIV_INTERFACE#$PRIVATE_INTERFACE#" $FOREMAN_DIR/db/seeds.rb
 sed -i "s#PUB_INTERFACE#$PUBLIC_INTERFACE#" $FOREMAN_DIR/db/seeds.rb
 sed -i "s#PRIV_IP#$PRIVATE_CONTROLLER_IP#" $FOREMAN_DIR/db/seeds.rb

bin/seeds.rb

@@ -10,9 +10,13 @@
 require 'facter'
 require 'securerandom'
 
+# for openstack
 private_int = 'PRIV_INTERFACE'
 public_int = 'PUB_INTERFACE'
 
+# for the sub-network foreman owns
+secondary_int = 'SECONDARY_INT'
+
 # Changes from upstream:
 # - EPEL removed
 # - SELinux enforcing
@@ -165,8 +169,8 @@
 
  # Subnets - use Import Subnet code
  s=Subnet.find_or_create_by_name "OpenStack"
- s.network=Facter.send "network_#{private_int}"
- s.mask=Facter.send "netmask_#{private_int}"
+ s.network=Facter.send "network_#{secondary_int}"
+ s.mask=Facter.send "netmask_#{secondary_int}"
  s.dhcp = Feature.find_by_name("DHCP").smart_proxies.first
  s.dns = Feature.find_by_name("DNS").smart_proxies.first
  s.tftp = Feature.find_by_name("TFTP").smart_proxies.first