diff --git a/xCAT-OpenStack/templates/cloud_environment/grizzly_allinone.rb.tmpl b/xCAT-OpenStack/templates/cloud_environment/grizzly_allinone.rb.tmpl
index c8b37df8c..ec93c9f8e 100644
--- a/xCAT-OpenStack/templates/cloud_environment/grizzly_allinone.rb.tmpl
+++ b/xCAT-OpenStack/templates/cloud_environment/grizzly_allinone.rb.tmpl
@@ -105,7 +105,10 @@ override_attributes(
      "identity_service_chef_role" => "allinone-compute"
    },
    "block-storage" => {
-     "keystone_service_chef_role" => "allinone-compute"
+        "rabbit"=>{
+           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
+        },
+        "keystone_service_chef_role" => "allinone-compute"
    },
    "dashboard" => {
      "keystone_service_chef_role" => "allinone-compute",
diff --git a/xCAT-OpenStack/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl b/xCAT-OpenStack/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl
index 41e987f22..e22cdb58b 100644
--- a/xCAT-OpenStack/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl
+++ b/xCAT-OpenStack/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl
@@ -108,7 +108,10 @@ override_attributes(
      "identity_service_chef_role" => "allinone-compute"
    },
    "block-storage" => {
-     "keystone_service_chef_role" => "allinone-compute"
+        "rabbit"=>{
+           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
+        },
+        "keystone_service_chef_role" => "allinone-compute"
    },
    "dashboard" => {
      "keystone_service_chef_role" => "allinone-compute",
diff --git a/xCAT-OpenStack/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl b/xCAT-OpenStack/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
index 2ea81bf62..5832657f0 100644
--- a/xCAT-OpenStack/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
+++ b/xCAT-OpenStack/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
@@ -105,6 +105,11 @@ override_attributes(
        "cirros" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
      },
    },
+   "block-storage" => {
+        "rabbit"=>{
+           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
+        }
+   },
    "dashboard" => {
       "use_ssl" => "false"
    },
diff --git a/xCAT-OpenStack/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl b/xCAT-OpenStack/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl
index 5ce8c7b76..fe26e0414 100644
--- a/xCAT-OpenStack/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl
+++ b/xCAT-OpenStack/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl
@@ -108,6 +108,11 @@ override_attributes(
        "cirros" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
      },
    },
+   "block-storage" => {
+        "rabbit"=>{
+           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
+        }
+   },
    "dashboard" => {
       "use_ssl" => "false"
    },