diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl
index ff1aa4779..ec93c9f8e 100644
--- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl
+++ b/xCAT-OpenStack/share/xcat/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",
@@ -129,7 +132,7 @@ override_attributes(
         "openvswitch"=> {
             "tenant_network_type"=>"vlan",
             "network_vlan_ranges"=>"physnet1",
-            "bridge_mappings"=>"physnet1:#TABLE:clouds:name=$CLOUD:datainterface#"
+            "bridge_mappings"=>"physnet1:br-#TABLE:clouds:name=$CLOUD:datainterface#"
         }
     },
    "compute" => {
diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl
index b585e121d..e22cdb58b 100644
--- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl
+++ b/xCAT-OpenStack/share/xcat/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",
@@ -132,7 +135,7 @@ override_attributes(
         "openvswitch"=> {
             "tenant_network_type"=>"vlan",
             "network_vlan_ranges"=>"physnet1",
-            "bridge_mappings"=>"physnet1:#TABLE:clouds:name=$CLOUD:datainterface#"
+            "bridge_mappings"=>"physnet1:br-#TABLE:clouds:name=$CLOUD:datainterface#"
         }
     },
    "compute" => {
diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
index 6fe05cf34..5832657f0 100644
--- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
+++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
@@ -105,10 +105,16 @@ 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"
    },
    "network" => {
+        "network_server_chef_role" => "os-single-controller",
         "metadata"=>{
            "nova_metadata_ip"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },
@@ -131,7 +137,7 @@ override_attributes(
         }
    },
    "compute" => {
-        "identity_service_chef_role" => "os-compute-single-controller",
+        "identity_service_chef_role" => "os-single-controller",
         "rabbit"=>{
            "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },
diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl
index 5ce8c7b76..9eec03a8b 100644
--- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl
+++ b/xCAT-OpenStack/share/xcat/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"
    },
@@ -134,7 +139,7 @@ override_attributes(
         }
    },
    "compute" => {
-        "identity_service_chef_role" => "os-compute-single-controller",
+        "identity_service_chef_role" => "os-single-controller",
         "rabbit"=>{
            "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },