Merge "Add environment and roles for heat support"

This commit is contained in:
Jenkins 2014-01-17 20:26:50 +00:00 committed by Gerrit Code Review
commit 233b103c53
6 changed files with 48 additions and 0 deletions

View File

@ -78,6 +78,9 @@ override_attributes(
},
"metering" => {
"host" => "10.0.3.10"
},
"orchestration" => {
"host" => "10.0.3.10"
}
},
"developer_mode" => true,
@ -153,6 +156,18 @@ override_attributes(
"scheme" => "http",
"port" => "9696",
"path" => "/v2"
},
"orchestration-api" => {
"host" => "10.0.3.11",
"scheme" => "http",
"port" => "8004",
"path" => "/v1/%(tenant_id)s"
},
"orchestration-api-cfn" => {
"host" => "10.0.3.11",
"scheme" => "http",
"port" => "8000",
"path" => "/v1"
}
},
"identity" => {

View File

@ -0,0 +1,6 @@
name "os-orchestration-api-cfn"
description "Role for Heat CloudFormation Api Service."
run_list(
"role[os-base]",
"recipe[openstack-orchestration::api-cfn]"
)

View File

@ -0,0 +1,6 @@
name "os-orchestration-api-cloudwatch"
description "Role for Heat CloudWatch Api Service."
run_list(
"role[os-base]",
"recipe[openstack-orchestration::api-cloudwatch]"
)

View File

@ -0,0 +1,6 @@
name "os-orchestration-api"
description "Role for Heat Api Service."
run_list(
"role[os-base]",
"recipe[openstack-orchestration::api]"
)

View File

@ -0,0 +1,6 @@
name "os-orchestration-engine"
description "Role for Heat Engine Service."
run_list(
"role[os-base]",
"recipe[openstack-orchestration::engine]"
)

View File

@ -0,0 +1,9 @@
name "os-orchestration"
description "Role for Heat."
run_list(
"role[os-orchestration-engine]",
"role[os-orchestration-api]",
"role[os-orchestration-api-cfn]",
"role[os-orchestration-api-cloudwatch]",
"recipe[openstack-orchestration::identity_registration]"
)