diff --git a/manifests/compute.pp b/manifests/compute.pp index a791adf..1227cb6 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -42,6 +42,7 @@ class openstack::compute ( # Rabbit $rabbit_host = '127.0.0.1', $rabbit_user = 'nova', + $rabbit_virtual_host = '/', # Glance $glance_api_servers = false, # Virtualization @@ -82,13 +83,14 @@ class openstack::compute ( } class { 'nova': - sql_connection => $sql_connection, - rabbit_userid => $rabbit_user, - rabbit_password => $rabbit_password, - image_service => 'nova.image.glance.GlanceImageService', - glance_api_servers => $glance_api_servers, - verbose => $verbose, - rabbit_host => $rabbit_host, + sql_connection => $sql_connection, + rabbit_userid => $rabbit_user, + rabbit_password => $rabbit_password, + image_service => 'nova.image.glance.GlanceImageService', + glance_api_servers => $glance_api_servers, + verbose => $verbose, + rabbit_host => $rabbit_host, + rabbit_virtual_host => $rabbit_virtual_host, } # Install / configure nova-compute diff --git a/manifests/controller.pp b/manifests/controller.pp index 6e750db..dd22a99 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -18,6 +18,7 @@ # [nova_user_password] Nova service password. # [rabbit_password] Rabbit password. # [rabbit_user] Rabbit User. +# [rabbit_virtual_host] Rabbit virtual host path for Nova. Defaults to '/'. # [network_manager] Nova network manager to use. # [fixed_range] Range of ipv4 network for vms. # [floating_range] Floating ip range to create. @@ -117,6 +118,7 @@ class openstack::controller ( $network_config = {}, # Rabbit $rabbit_user = 'nova', + $rabbit_virtual_host = '/', # Horizon $horizon = true, $cache_server_ip = '127.0.0.1', @@ -269,6 +271,7 @@ class openstack::controller ( # Rabbit rabbit_user => $rabbit_user, rabbit_password => $rabbit_password, + rabbit_virtual_host => $rabbit_virtual_host, # Glance glance_api_servers => $glance_api_servers, # VNC diff --git a/manifests/nova/controller.pp b/manifests/nova/controller.pp index 565e67e..67cb89f 100644 --- a/manifests/nova/controller.pp +++ b/manifests/nova/controller.pp @@ -53,6 +53,7 @@ class openstack::nova::controller ( $nova_db_dbname = 'nova', # Rabbit $rabbit_user = 'nova', + $rabbit_virtual_host = '/', # Database $db_type = 'mysql', # Glance @@ -84,9 +85,10 @@ class openstack::nova::controller ( # Install / configure rabbitmq class { 'nova::rabbitmq': - userid => $rabbit_user, - password => $rabbit_password, - enabled => $enabled, + userid => $rabbit_user, + password => $rabbit_password, + enabled => $enabled, + virtual_host => $rabbit_virtual_host, } # Configure Nova diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp deleted file mode 100644 index e69de29..0000000