Merge pull request #7 from gildub/neutron

Neutron dhcp fix
redhat-openstack · Sep 12, 2013 · 30949df · 30949df
2 parents 568c33c + 8f92bbe
commit 30949df
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/puppet/modules/quickstack/manifests/neutron/compute.pp b/puppet/modules/quickstack/manifests/neutron/compute.pp
@@ -1,17 +1,18 @@
 # Common quickstack configurations
 class quickstack::neutron::compute (
- $admin_password = $quickstack::params::admin_password,
- $fixed_network_range = $quickstack::params::fixed_network_range,
- $floating_network_range = $quickstack::params::floating_network_range,
- $neutron_db_password = $quickstack::params::neutron_db_password,
- $neutron_user_password = $quickstack::params::neutron_user_password,
- $nova_db_password = $quickstack::params::nova_db_password,
- $nova_user_password = $quickstack::params::nova_user_password,
- $pacemaker_priv_floating_ip = $quickstack::params::pacemaker_priv_floating_ip,
- $pacemaker_pub_floating_ip = $quickstack::params::pacemaker_pub_floating_ip,
- $private_interface = $quickstack::params::private_interface,
- $public_interface = $quickstack::params::public_interface,
- $verbose = $quickstack::params::verbose,
+ $admin_password = $quickstack::params::admin_password,
+ $fixed_network_range = $quickstack::params::fixed_network_range,
+ $floating_network_range = $quickstack::params::floating_network_range,
+ $neutron_db_password = $quickstack::params::neutron_db_password,
+ $neutron_user_password = $quickstack::params::neutron_user_password,
+ $nova_db_password = $quickstack::params::nova_db_password,
+ $nova_user_password = $quickstack::params::nova_user_password,
+ $private_ip = $quickstack::params::private_ip,
+ $pacemaker_priv_floating_ip = $quickstack::params::pacemaker_priv_floating_ip,
+ $pacemaker_pub_floating_ip = $quickstack::params::pacemaker_pub_floating_ip,
+ $private_interface = $quickstack::params::private_interface,
+ $public_interface = $quickstack::params::public_interface,
+ $verbose = $quickstack::params::verbose,
 ) inherits quickstack::params {
 
  # Configure Nova
@@ -110,7 +111,7 @@
 
  # Agent
  class { '::neutron::agents::ovs':
- local_ip => $::ipaddress,
+ local_ip => $private_ip,
  enable_tunneling => true,
  }
 

diff --git a/puppet/modules/quickstack/manifests/neutron/networker.pp b/puppet/modules/quickstack/manifests/neutron/networker.pp
@@ -5,6 +5,7 @@
  $neutron_db_password = $quickstack::params::neutron_db_password,
  $nova_db_password = $quickstack::params::nova_db_password,
  $nova_user_password = $quickstack::params::nova_user_password,
+ $private_ip = $quickstack::params::private_ip,
  $pacemaker_priv_floating_ip = $quickstack::params::pacemaker_priv_floating_ip,
  $private_interface = $quickstack::params::private_interface,
  $public_interface = $quickstack::params::public_interface,
@@ -38,7 +39,7 @@
 
  # Agents
  class { '::neutron::agents::ovs':
- local_ip => $::ipaddress,
+ local_ip => $private_ip,
  enable_tunneling => true,
  }
 

diff --git a/puppet/modules/quickstack/manifests/params.pp b/puppet/modules/quickstack/manifests/params.pp
@@ -23,6 +23,7 @@
  # Networking
  $private_interface = 'PRIV_INTERFACE'
  $public_interface = 'PUB_INTERFACE'
+ $private_ip = $ipaddress_<PRIV_INTERFACE>
  $fixed_network_range = 'PRIV_RANGE'
  $floating_network_range = 'PUB_RANGE'
  $pacemaker_priv_floating_ip = 'PRIV_IP'