Fix configuration of nova.conf and Qpid as RPC backend

dzungdo · May 31, 2013 · bc20574 · bc20574
1 parent d55d0b9
commit bc20574
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/puppet/trystack/manifests/compute.pp b/puppet/trystack/manifests/compute.pp
@@ -13,22 +13,22 @@
 
  # Configure Nova
  nova_config{
- 'auto_assign_floating_ip': value => 'True';
- #"network_host": value => ${pacemaker_priv_floating_ip;
- "network_host": value => "$::ipaddress";
- "libvirt_inject_partition": value => "-1";
- #"metadata_host": value => "$pacemaker_priv_floating_ip";
- "metadata_host": value => "$::ipaddress";
- "qpid_hostname": value => "$pacemaker_priv_floating_ip";
- "rpc_backend": value => "nova.rpc.impl_qpid";
- "multi_host": value => "True";
+ 'DEFAULT/auto_assign_floating_ip': value => 'True';
+ #"DEFAULT/network_host": value => ${pacemaker_priv_floating_ip;
+ "DEFAULT/network_host": value => "$::ipaddress";
+ "DEFAULT/libvirt_inject_partition": value => "-1";
+ #"DEFAULT/metadata_host": value => "$pacemaker_priv_floating_ip";
+ "DEFAULT/metadata_host": value => "$::ipaddress";
+ "DEFAULT/multi_host": value => "True";
  }
 
  class { 'nova':
- sql_connection => "mysql:https://nova:${nova_db_password}@${pacemaker_priv_floating_ip}/nova",
- image_service => 'nova.image.glance.GlanceImageService',
- glance_api_servers => "http:https://$pacemaker_priv_floating_ip:9292/v1",
- verbose => $verbose,
+ sql_connection => "mysql:https://nova:${nova_db_password}@${pacemaker_priv_floating_ip}/nova",
+ image_service => 'nova.image.glance.GlanceImageService',
+ glance_api_servers => "http:https://$pacemaker_priv_floating_ip:9292/v1",
+ rpc_backend => 'nova.openstack.common.rpc.impl_qpid',
+ qpid_hostname => $pacemaker_priv_floating_ip,
+ verbose => $verbose,
  }
 
  # uncomment if on a vm

diff --git a/puppet/trystack/manifests/controller.pp b/puppet/trystack/manifests/controller.pp
@@ -101,11 +101,12 @@
 
  # Configure Nova
  class { 'nova':
- sql_connection => "mysql:https://nova:${nova_db_password}@${pacemaker_priv_floating_ip}/nova",
- image_service => 'nova.image.glance.GlanceImageService',
- glance_api_servers => "http:https://${pacemaker_priv_floating_ip}:9292/v1",
- verbose => $verbose,
- require => Class['openstack::db::mysql', 'qpid::server'],
+ sql_connection => "mysql:https://nova:${nova_db_password}@${pacemaker_priv_floating_ip}/nova",
+ image_service => 'nova.image.glance.GlanceImageService',
+ glance_api_servers => "http:https://${pacemaker_priv_floating_ip}:9292/v1",
+ rpc_backend => 'nova.openstack.common.rpc.impl_qpid',
+ verbose => $verbose,
+ require => Class['openstack::db::mysql', 'qpid::server'],
  }
 
  class { 'nova::api':
@@ -115,10 +116,9 @@
  }
 
  nova_config {
- 'auto_assign_floating_ip': value => 'True';
- 'rpc_backend': value => 'nova.rpc.impl_qpid';
- 'multi_host': value => 'True';
- 'force_dhcp_release': value => 'False';
+ 'DEFAULT/auto_assign_floating_ip': value => 'True';
+ 'DEFAULT/multi_host': value => 'True';
+ 'DEFAULT/force_dhcp_release': value => 'False';
  }
 
  class { [ 'nova::scheduler', 'nova::cert', 'nova::consoleauth' ]: