diff --git a/xCAT-OpenStack/chef-cookbooks/grizzly-xcat/environments/grizzly_allinone.rb.tmpl b/xCAT-OpenStack/chef-cookbooks/grizzly-xcat/environments/grizzly_allinone.rb.tmpl
deleted file mode 100644
index ff1aa4779..000000000
--- a/xCAT-OpenStack/chef-cookbooks/grizzly-xcat/environments/grizzly_allinone.rb.tmpl
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
-#
-
-name "$CLOUD"
-description "Grizzly allinone environment file."
-
-override_attributes(
-  "mysql" => {
-    "server_root_password" => "cluster",
-    "server_debian_password" => "cluster",
-    "server_repl_password" => "cluster",
-    "allow_remote_root" => true,
-    "root_network_acl" => "%"
-  },
-  "openstack" => {
-    "developer_mode" => true,
-    "db"=>{
-       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
-        "compute"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "identity"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "image"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "network"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "volume"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "dashboard"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "metering"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        }
-     },
-
-    "mq"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
-     },
-    "identity"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
-        "db"=>{
-            "username"=>"keystone",
-            "password"=> "keystone"
-         }
-     },
-
-    "endpoints"=>{
-        "identity-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "identity-admin"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-ec2-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-ec2-admin"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-xvpvnc"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-novnc"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "network-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "image-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "image-registry"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "volume-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "metering-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        }
-     },
-
-   "image" => {
-       "api"=>{
-          "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
-       },
-       "registry"=>{
-          "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" 
-       },
-       "image_upload" => false,
-       "upload_images" => ["cirros"],
-       "upload_image" => {
-          "cirros" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
-      },
-     "identity_service_chef_role" => "allinone-compute"
-   },
-   "block-storage" => {
-     "keystone_service_chef_role" => "allinone-compute"
-   },
-   "dashboard" => {
-     "keystone_service_chef_role" => "allinone-compute",
-      "use_ssl" => "false"
-   },
-   "network" => {
-        "metadata"=>{
-           "nova_metadata_ip"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "rabbit"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "api"=>{
-            "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
-         },
-
-       "rabbit_server_chef_role" => "allinone-compute",
-       "l3"=>{
-           "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
-        },
-        "openvswitch"=> {
-            "tenant_network_type"=>"vlan",
-            "network_vlan_ranges"=>"physnet1",
-            "bridge_mappings"=>"physnet1:#TABLE:clouds:name=$CLOUD:datainterface#"
-        }
-    },
-   "compute" => {
-       "identity_service_chef_role" => "allinone-compute",
-       "rabbit"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-       },
-       "xvpvnc_proxy"=>{
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
-       },
-       "novnc_proxy"=>{
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
-       },
-       "network" => {
-          "service_type" => "quantum"
-        },
-       "config" => {
-           "ram_allocation_ratio" => 5.0
-       },
-       "libvirt" => { 
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",  
-           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" 
-       }    
-    }
-  }
-  )
diff --git a/xCAT-OpenStack/chef-cookbooks/grizzly-xcat/environments/grizzly_per-tenant_routers_with_private_networks.rb.tmpl b/xCAT-OpenStack/chef-cookbooks/grizzly-xcat/environments/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
deleted file mode 100644
index 6fe05cf34..000000000
--- a/xCAT-OpenStack/chef-cookbooks/grizzly-xcat/environments/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
+++ /dev/null
@@ -1,156 +0,0 @@
-# 
-# IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
-# http://docs.openstack.org/grizzly/openstack-network/admin/content/app_demo_routers_with_private_networks.html
-#
-#
-
-name "$CLOUD"
-description "Grizzly environment file based on Per-tenant Routers with Private Networks"
-
-override_attributes(
-  "mysql" => {
-    "server_root_password" => "cluster",
-    "server_debian_password" => "cluster",
-    "server_repl_password" => "cluster",
-    "allow_remote_root" => true,
-    "root_network_acl" => "%"
-  },
-  "openstack" => {
-    "developer_mode" => true,
-    "db"=>{
-       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
-        "compute"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "identity"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "image"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "network"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "volume"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "dashboard"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "metering"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        }
-     },
-    "mq"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
-     },
-    "identity"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
-        "db"=>{
-            "username"=>"keystone",
-            "password"=> "keystone"
-         }
-     },
-
-    "endpoints"=>{
-        "identity-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "identity-admin"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-ec2-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-ec2-admin"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-xvpvnc"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "compute-novnc"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "network-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "image-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "image-registry"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "volume-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        },
-        "metering-api"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#",
-        }
-     },
-
-
-   "image" => {
-    "api"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
-     },
-    "registry"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" 
-     },
-     "image_upload" => false,
-     "upload_images" => ["cirros"],
-     "upload_image" => {
-       "cirros" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
-     },
-   },
-   "dashboard" => {
-      "use_ssl" => "false"
-   },
-   "network" => {
-        "metadata"=>{
-           "nova_metadata_ip"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "rabbit"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-        "api"=>{
-            "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
-         },
-        "l3"=>{
-            "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" 
-         },
-        "allow_overlapping_ips" => "True",
-        "use_namespaces" => "True",
-        "openvswitch"=> {
-            "tenant_network_type"=>"gre",
-            "tunnel_id_ranges"=>"1:1000",
-            "enable_tunneling"=>"True",
-            "local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#" 
-        }
-   },
-   "compute" => {
-        "identity_service_chef_role" => "os-compute-single-controller",
-        "rabbit"=>{
-           "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
-        },
-       "xvpvnc_proxy"=>{
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" 
-       },
-       "novnc_proxy"=>{
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" 
-       },
-       "network" => {
-           "service_type" => "quantum",
-       },
-      "config" => {
-           "ram_allocation_ratio" => 5.0
-      },
-      "libvirt" => { 
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",  
-           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" 
-      }    
-   }
-  }
-  )