Rename openstack-metering to openstack-telemetry

update cookbook name, role name, attributes and related things

Change-Id: I8c8855579fd88746c447b9dda189e93f644584b2
This commit is contained in:
Chen Zhiwei 2014-03-12 22:10:35 -04:00
parent 26d1be88b2
commit 330b99548f
11 changed files with 35 additions and 35 deletions

View File

@ -20,9 +20,9 @@ cookbook 'openstack-compute', github: 'stackforge/cookbook-openstack-compute'
cookbook 'openstack-dashboard', github: 'stackforge/cookbook-openstack-dashboard'
cookbook 'openstack-identity', github: 'stackforge/cookbook-openstack-identity'
cookbook 'openstack-image', github: 'stackforge/cookbook-openstack-image'
cookbook 'openstack-metering', github: 'stackforge/cookbook-openstack-metering'
cookbook 'openstack-network', github: 'stackforge/cookbook-openstack-network'
cookbook 'openstack-object-storage', github: 'stackforge/cookbook-openstack-object-storage'
cookbook 'openstack-ops-database', github: 'stackforge/cookbook-openstack-ops-database'
cookbook 'openstack-ops-messaging', github: 'stackforge/cookbook-openstack-ops-messaging'
cookbook 'openstack-orchestration', github: 'stackforge/cookbook-openstack-orchestration'
cookbook 'openstack-telemetry', github: 'stackforge/cookbook-openstack-telemetry'

View File

@ -76,7 +76,7 @@ override_attributes(
"dashboard" => {
"host" => "10.0.3.10"
},
"metering" => {
"telemetry" => {
"host" => "10.0.3.10"
},
"orchestration" => {
@ -145,7 +145,7 @@ override_attributes(
"port" => "8776",
"path" => "/v1/%(tenant_id)s"
},
"metering-api" => {
"telemetry-api" => {
"host" => "10.0.3.11",
"scheme" => "http",
"port" => "8777",

View File

@ -30,10 +30,10 @@ roles:
- os-image-api:
- os-image-registry:
- os-image-upload:
- os-metering-agent-central:
- os-metering-agent-compute:
- os-metering-api:
- os-metering-collector:
- os-telemetry-agent-central:
- os-telemetry-agent-compute:
- os-telemetry-api:
- os-telemetry-collector:
- os-network:
- os-network-server:
- os-network-l3-agent:

View File

@ -1,7 +0,0 @@
name "os-metering-agent-central"
description "agent-central for metering"
run_list(
"role[os-base]",
"recipe[openstack-metering::identity_registration]",
"recipe[openstack-metering::agent-central]"
)

View File

@ -1,7 +0,0 @@
name "os-metering-agent-compute"
description "agent-compute for metering"
run_list(
"role[os-base]",
"recipe[openstack-metering::identity_registration]",
"recipe[openstack-metering::agent-compute]"
)

View File

@ -1,7 +0,0 @@
name "os-metering-api"
description "api for metering"
run_list(
"role[os-base]",
"recipe[openstack-metering::identity_registration]",
"recipe[openstack-metering::api]"
)

View File

@ -1,7 +0,0 @@
name "os-metering-collector"
description "collector for metering"
run_list(
"role[os-base]",
"recipe[openstack-metering::identity_registration]",
"recipe[openstack-metering::collector]"
)

View File

@ -0,0 +1,7 @@
name "os-telemetry-agent-central"
description "agent-central for telemetry"
run_list(
"role[os-base]",
"recipe[openstack-telemetry::identity_registration]",
"recipe[openstack-telemetry::agent-central]"
)

View File

@ -0,0 +1,7 @@
name "os-telemetry-agent-compute"
description "agent-compute for telemetry"
run_list(
"role[os-base]",
"recipe[openstack-telemetry::identity_registration]",
"recipe[openstack-telemetry::agent-compute]"
)

View File

@ -0,0 +1,7 @@
name "os-telemetry-api"
description "api for telemetry"
run_list(
"role[os-base]",
"recipe[openstack-telemetry::identity_registration]",
"recipe[openstack-telemetry::api]"
)

View File

@ -0,0 +1,7 @@
name "os-telemetry-collector"
description "collector for telemetry"
run_list(
"role[os-base]",
"recipe[openstack-telemetry::identity_registration]",
"recipe[openstack-telemetry::collector]"
)