From 330b99548ffd9533caa66ba3748eee9a3de3d214 Mon Sep 17 00:00:00 2001 From: Chen Zhiwei Date: Wed, 12 Mar 2014 22:10:35 -0400 Subject: [PATCH] Rename openstack-metering to openstack-telemetry update cookbook name, role name, attributes and related things Change-Id: I8c8855579fd88746c447b9dda189e93f644584b2 --- Berksfile | 2 +- environments/testing.rb | 4 ++-- infrastructure.yml | 8 ++++---- roles/os-metering-agent-central.rb | 7 ------- roles/os-metering-agent-compute.rb | 7 ------- roles/os-metering-api.rb | 7 ------- roles/os-metering-collector.rb | 7 ------- roles/os-telemetry-agent-central.rb | 7 +++++++ roles/os-telemetry-agent-compute.rb | 7 +++++++ roles/os-telemetry-api.rb | 7 +++++++ roles/os-telemetry-collector.rb | 7 +++++++ 11 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 roles/os-metering-agent-central.rb delete mode 100644 roles/os-metering-agent-compute.rb delete mode 100644 roles/os-metering-api.rb delete mode 100644 roles/os-metering-collector.rb create mode 100644 roles/os-telemetry-agent-central.rb create mode 100644 roles/os-telemetry-agent-compute.rb create mode 100644 roles/os-telemetry-api.rb create mode 100644 roles/os-telemetry-collector.rb diff --git a/Berksfile b/Berksfile index 88ec8c6..ba3507d 100644 --- a/Berksfile +++ b/Berksfile @@ -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' diff --git a/environments/testing.rb b/environments/testing.rb index fe67e6a..49ae287 100644 --- a/environments/testing.rb +++ b/environments/testing.rb @@ -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", diff --git a/infrastructure.yml b/infrastructure.yml index e731e47..f42a675 100644 --- a/infrastructure.yml +++ b/infrastructure.yml @@ -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: diff --git a/roles/os-metering-agent-central.rb b/roles/os-metering-agent-central.rb deleted file mode 100644 index 9e05d46..0000000 --- a/roles/os-metering-agent-central.rb +++ /dev/null @@ -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]" - ) diff --git a/roles/os-metering-agent-compute.rb b/roles/os-metering-agent-compute.rb deleted file mode 100644 index 47d0c6f..0000000 --- a/roles/os-metering-agent-compute.rb +++ /dev/null @@ -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]" - ) diff --git a/roles/os-metering-api.rb b/roles/os-metering-api.rb deleted file mode 100644 index 60e805f..0000000 --- a/roles/os-metering-api.rb +++ /dev/null @@ -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]" - ) diff --git a/roles/os-metering-collector.rb b/roles/os-metering-collector.rb deleted file mode 100644 index 8299f38..0000000 --- a/roles/os-metering-collector.rb +++ /dev/null @@ -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]" - ) diff --git a/roles/os-telemetry-agent-central.rb b/roles/os-telemetry-agent-central.rb new file mode 100644 index 0000000..cf1abe3 --- /dev/null +++ b/roles/os-telemetry-agent-central.rb @@ -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]" + ) diff --git a/roles/os-telemetry-agent-compute.rb b/roles/os-telemetry-agent-compute.rb new file mode 100644 index 0000000..9f0c75a --- /dev/null +++ b/roles/os-telemetry-agent-compute.rb @@ -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]" + ) diff --git a/roles/os-telemetry-api.rb b/roles/os-telemetry-api.rb new file mode 100644 index 0000000..711f96b --- /dev/null +++ b/roles/os-telemetry-api.rb @@ -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]" + ) diff --git a/roles/os-telemetry-collector.rb b/roles/os-telemetry-collector.rb new file mode 100644 index 0000000..d7421de --- /dev/null +++ b/roles/os-telemetry-collector.rb @@ -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]" + )