support for cinder

This commit is contained in:
jjhua 2013-12-23 16:29:55 -05:00
parent 71213c8719
commit 623ccadcc0
4 changed files with 23 additions and 6 deletions

View File

@ -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" => {

View File

@ -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" => {

View File

@ -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#"
},

View File

@ -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#"
},