diff --git a/packstack/plugins/magnum_920.py b/packstack/plugins/magnum_920.py
index 02cb72a80..5f5c90e45 100755
--- a/packstack/plugins/magnum_920.py
+++ b/packstack/plugins/magnum_920.py
@@ -22,6 +22,7 @@ from packstack.installer import utils
 from packstack.installer import validators
 
 from packstack.modules.documentation import update_params_usage
+from packstack.modules.ospluginutils import generate_ssl_cert
 
 # ------------- Magnum Packstack Plugin Initialization --------------
 PLUGIN_NAME = "OS-Magnum"
diff --git a/packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp
index a9632b9a7..7344efca1 100644
--- a/packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp
@@ -18,7 +18,7 @@ class packstack::aodh::rabbitmq ()
       file { $files_to_set_owner:
         owner   => 'aodh',
         group   => 'aodh',
-        require => Package['openstack-aodh-common'],
+        require => Package['aodh'],
       }
       File[$files_to_set_owner] ~> Service<| tag == 'aodh-service' |>
     }
diff --git a/packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp
index 01375c2f4..18598c77c 100644
--- a/packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp
@@ -14,7 +14,7 @@ class packstack::ceilometer::rabbitmq ()
       file { $files_to_set_owner:
         owner   => 'ceilometer',
         group   => 'ceilometer',
-        require => Package['openstack-ceilometer-common'],
+        require => Package['ceilometer-common'],
       }
       File[$files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |>
     }
diff --git a/packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp
index 6d1415834..43af51416 100755
--- a/packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp
@@ -14,9 +14,9 @@ class packstack::magnum::rabbitmq ()
       file { $files_to_set_owner:
         owner   => 'magnum',
         group   => 'magnum',
-        require => Package['openstack-magnum-common'],
+        require => Package['magnum-common'],
       }
-      File[$files_to_set_owner] ~> Service<||>
+      File[$files_to_set_owner] ~> Service<| tag == 'magnum-service' |>
     }
 
     class { '::magnum':