From 02abf1a5e8d48a41d35d901c2cb2e1be992677d6 Mon Sep 17 00:00:00 2001 From: Weidong Shao Date: Thu, 7 Aug 2014 19:40:23 +0000 Subject: [PATCH] Update roles using .json files Change-Id: I561d2400104776937629e60a7dfc44d6810fe711 --- chef/roles/allinone-compute.json | 17 +++++++++++ chef/roles/allinone-compute.rb | 6 ---- chef/roles/os-base.json | 18 +++++++++++ chef/roles/os-base.rb | 6 ---- chef/roles/os-block-storage-api.json | 16 ++++++++++ chef/roles/os-block-storage-api.rb | 23 -------------- chef/roles/os-block-storage-controller.json | 18 +++++++++++ chef/roles/os-block-storage-scheduler.json | 16 ++++++++++ chef/roles/os-block-storage-scheduler.rb | 23 -------------- chef/roles/os-block-storage-volume.json | 16 ++++++++++ chef/roles/os-block-storage-worker.rb | 23 -------------- chef/roles/os-block-storage.json | 19 ++++++++++++ chef/roles/os-block-storage.rb | 8 ----- chef/roles/os-client.json | 24 +++++++++++++++ chef/roles/os-compute-api-ec2.json | 16 ++++++++++ chef/roles/os-compute-api-ec2.rb | 6 ---- chef/roles/os-compute-api-metadata.json | 16 ++++++++++ chef/roles/os-compute-api-metadata.rb | 15 ---------- chef/roles/os-compute-api-os-compute.json | 16 ++++++++++ chef/roles/os-compute-api-os-compute.rb | 23 -------------- chef/roles/os-compute-api.json | 19 ++++++++++++ chef/roles/os-compute-api.rb | 7 ----- chef/roles/os-compute-cert.json | 16 ++++++++++ chef/roles/os-compute-cert.rb | 15 ---------- chef/roles/os-compute-conductor.json | 16 ++++++++++ chef/roles/os-compute-controller.json | 21 +++++++++++++ chef/roles/os-compute-controller.rb | 11 ------- chef/roles/os-compute-scheduler.json | 16 ++++++++++ chef/roles/os-compute-scheduler.rb | 25 ---------------- chef/roles/os-compute-setup.json | 17 +++++++++++ ...-compute-single-controller-no-network.json | 28 +++++++++++++++++ chef/roles/os-compute-single-controller.json | 29 ++++++++++++++++++ chef/roles/os-compute-single-controller.rb | 16 ---------- chef/roles/os-compute-vncproxy.json | 16 ++++++++++ chef/roles/os-compute-vncproxy.rb | 16 ---------- chef/roles/os-compute-worker.json | 16 ++++++++++ chef/roles/os-compute-worker.rb | 24 --------------- chef/roles/os-controller.rb | 17 ----------- chef/roles/os-dashboard.json | 17 +++++++++++ chef/roles/os-dashboard.rb | 16 ---------- chef/roles/os-ha.rb | 15 ---------- chef/roles/os-identity-api-admin.rb | 7 ----- chef/roles/os-identity-api.rb | 6 ---- chef/roles/os-identity.json | 17 +++++++++++ chef/roles/os-identity.rb | 24 --------------- chef/roles/os-image-api.json | 16 ++++++++++ chef/roles/os-image-api.rb | 25 ---------------- chef/roles/os-image-registry.json | 16 ++++++++++ chef/roles/os-image-registry.rb | 25 ---------------- chef/roles/os-image-upload.json | 16 ++++++++++ chef/roles/os-image.json | 18 +++++++++++ chef/roles/os-image.rb | 6 ---- chef/roles/os-infra-caching.rb | 6 ---- chef/roles/os-network-dhcp-agent.json | 16 ++++++++++ chef/roles/os-network-l3-agent.json | 16 ++++++++++ chef/roles/os-network-metadata-agent.json | 16 ++++++++++ chef/roles/os-network-openvswitch.json | 16 ++++++++++ chef/roles/os-network-server.json | 17 +++++++++++ chef/roles/os-network-server.rb | 23 -------------- chef/roles/os-network-worker.json | 19 ++++++++++++ chef/roles/os-network.json | 21 +++++++++++++ chef/roles/os-network.rb | 30 ------------------- chef/roles/os-object-storage-account.json | 16 ++++++++++ chef/roles/os-object-storage-account.rb | 6 ---- chef/roles/os-object-storage-container.json | 16 ++++++++++ chef/roles/os-object-storage-container.rb | 6 ---- chef/roles/os-object-storage-management.json | 16 ++++++++++ chef/roles/os-object-storage-management.rb | 6 ---- chef/roles/os-object-storage-object.json | 16 ++++++++++ chef/roles/os-object-storage-object.rb | 6 ---- chef/roles/os-object-storage-proxy.json | 16 ++++++++++ chef/roles/os-object-storage-proxy.rb | 6 ---- chef/roles/os-object-storage.json | 20 +++++++++++++ chef/roles/os-object-storage.rb | 6 ---- chef/roles/os-ops-caching.json | 16 ++++++++++ chef/roles/os-ops-database.json | 17 +++++++++++ chef/roles/os-ops-database.rb | 24 --------------- chef/roles/os-ops-messaging.json | 16 ++++++++++ chef/roles/os-ops-messaging.rb | 23 -------------- chef/roles/os-orchestration-api-cfn.json | 16 ++++++++++ .../os-orchestration-api-cloudwatch.json | 16 ++++++++++ chef/roles/os-orchestration-api.json | 16 ++++++++++ chef/roles/os-orchestration-engine.json | 16 ++++++++++ chef/roles/os-orchestration.json | 19 ++++++++++++ chef/roles/os-single-controller.rb | 18 ----------- chef/roles/os-telemetry-agent-central.json | 17 +++++++++++ chef/roles/os-telemetry-agent-compute.json | 17 +++++++++++ .../os-telemetry-agent-notification.json | 17 +++++++++++ chef/roles/os-telemetry-alarm-evaluator.json | 17 +++++++++++ chef/roles/os-telemetry-alarm-notifier.json | 17 +++++++++++ chef/roles/os-telemetry-api.json | 17 +++++++++++ chef/roles/os-telemetry-collector.json | 17 +++++++++++ chef/roles/os-telemetry.json | 21 +++++++++++++ chef/roles/test-synclog.rb | 6 ---- 94 files changed, 979 insertions(+), 554 deletions(-) create mode 100644 chef/roles/allinone-compute.json delete mode 100644 chef/roles/allinone-compute.rb create mode 100644 chef/roles/os-base.json delete mode 100644 chef/roles/os-base.rb create mode 100644 chef/roles/os-block-storage-api.json delete mode 100644 chef/roles/os-block-storage-api.rb create mode 100644 chef/roles/os-block-storage-controller.json create mode 100644 chef/roles/os-block-storage-scheduler.json delete mode 100644 chef/roles/os-block-storage-scheduler.rb create mode 100644 chef/roles/os-block-storage-volume.json delete mode 100644 chef/roles/os-block-storage-worker.rb create mode 100644 chef/roles/os-block-storage.json delete mode 100644 chef/roles/os-block-storage.rb create mode 100644 chef/roles/os-client.json create mode 100644 chef/roles/os-compute-api-ec2.json delete mode 100644 chef/roles/os-compute-api-ec2.rb create mode 100644 chef/roles/os-compute-api-metadata.json delete mode 100644 chef/roles/os-compute-api-metadata.rb create mode 100644 chef/roles/os-compute-api-os-compute.json delete mode 100644 chef/roles/os-compute-api-os-compute.rb create mode 100644 chef/roles/os-compute-api.json delete mode 100644 chef/roles/os-compute-api.rb create mode 100644 chef/roles/os-compute-cert.json delete mode 100644 chef/roles/os-compute-cert.rb create mode 100644 chef/roles/os-compute-conductor.json create mode 100644 chef/roles/os-compute-controller.json delete mode 100644 chef/roles/os-compute-controller.rb create mode 100644 chef/roles/os-compute-scheduler.json delete mode 100644 chef/roles/os-compute-scheduler.rb create mode 100644 chef/roles/os-compute-setup.json create mode 100644 chef/roles/os-compute-single-controller-no-network.json create mode 100644 chef/roles/os-compute-single-controller.json delete mode 100644 chef/roles/os-compute-single-controller.rb create mode 100644 chef/roles/os-compute-vncproxy.json delete mode 100644 chef/roles/os-compute-vncproxy.rb create mode 100644 chef/roles/os-compute-worker.json delete mode 100644 chef/roles/os-compute-worker.rb delete mode 100644 chef/roles/os-controller.rb create mode 100644 chef/roles/os-dashboard.json delete mode 100644 chef/roles/os-dashboard.rb delete mode 100644 chef/roles/os-ha.rb delete mode 100644 chef/roles/os-identity-api-admin.rb delete mode 100644 chef/roles/os-identity-api.rb create mode 100644 chef/roles/os-identity.json delete mode 100644 chef/roles/os-identity.rb create mode 100644 chef/roles/os-image-api.json delete mode 100644 chef/roles/os-image-api.rb create mode 100644 chef/roles/os-image-registry.json delete mode 100644 chef/roles/os-image-registry.rb create mode 100644 chef/roles/os-image-upload.json create mode 100644 chef/roles/os-image.json delete mode 100644 chef/roles/os-image.rb delete mode 100644 chef/roles/os-infra-caching.rb create mode 100644 chef/roles/os-network-dhcp-agent.json create mode 100644 chef/roles/os-network-l3-agent.json create mode 100644 chef/roles/os-network-metadata-agent.json create mode 100644 chef/roles/os-network-openvswitch.json create mode 100644 chef/roles/os-network-server.json delete mode 100644 chef/roles/os-network-server.rb create mode 100644 chef/roles/os-network-worker.json create mode 100644 chef/roles/os-network.json delete mode 100644 chef/roles/os-network.rb create mode 100644 chef/roles/os-object-storage-account.json delete mode 100644 chef/roles/os-object-storage-account.rb create mode 100644 chef/roles/os-object-storage-container.json delete mode 100644 chef/roles/os-object-storage-container.rb create mode 100644 chef/roles/os-object-storage-management.json delete mode 100644 chef/roles/os-object-storage-management.rb create mode 100644 chef/roles/os-object-storage-object.json delete mode 100644 chef/roles/os-object-storage-object.rb create mode 100644 chef/roles/os-object-storage-proxy.json delete mode 100644 chef/roles/os-object-storage-proxy.rb create mode 100644 chef/roles/os-object-storage.json delete mode 100644 chef/roles/os-object-storage.rb create mode 100644 chef/roles/os-ops-caching.json create mode 100644 chef/roles/os-ops-database.json delete mode 100644 chef/roles/os-ops-database.rb create mode 100644 chef/roles/os-ops-messaging.json delete mode 100644 chef/roles/os-ops-messaging.rb create mode 100644 chef/roles/os-orchestration-api-cfn.json create mode 100644 chef/roles/os-orchestration-api-cloudwatch.json create mode 100644 chef/roles/os-orchestration-api.json create mode 100644 chef/roles/os-orchestration-engine.json create mode 100644 chef/roles/os-orchestration.json delete mode 100644 chef/roles/os-single-controller.rb create mode 100644 chef/roles/os-telemetry-agent-central.json create mode 100644 chef/roles/os-telemetry-agent-compute.json create mode 100644 chef/roles/os-telemetry-agent-notification.json create mode 100644 chef/roles/os-telemetry-alarm-evaluator.json create mode 100644 chef/roles/os-telemetry-alarm-notifier.json create mode 100644 chef/roles/os-telemetry-api.json create mode 100644 chef/roles/os-telemetry-collector.json create mode 100644 chef/roles/os-telemetry.json delete mode 100644 chef/roles/test-synclog.rb diff --git a/chef/roles/allinone-compute.json b/chef/roles/allinone-compute.json new file mode 100644 index 0000000..27c9824 --- /dev/null +++ b/chef/roles/allinone-compute.json @@ -0,0 +1,17 @@ +{ + "name": "allinone-compute", + "description": "This will deploy all of the services for Openstack Compute to function on a single box.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-compute-single-controller]", + "role[os-compute-worker]", + "recipe[openstack-common::openrc]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/allinone-compute.rb b/chef/roles/allinone-compute.rb deleted file mode 100644 index daa008a..0000000 --- a/chef/roles/allinone-compute.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "allinone-compute" -description "This will deploy all of the services for Openstack Compute to function on a single box." -run_list( - "role[os-compute-single-controller]", - "role[os-compute-worker]" -) diff --git a/chef/roles/os-base.json b/chef/roles/os-base.json new file mode 100644 index 0000000..cec9e00 --- /dev/null +++ b/chef/roles/os-base.json @@ -0,0 +1,18 @@ +{ + "name": "os-base", + "description": "OpenStack Base role", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "recipe[openstack-common]", + "recipe[openstack-common::logging]", + "recipe[openstack-common::set_endpoints_by_interface]", + "recipe[openstack-common::sysctl]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-base.rb b/chef/roles/os-base.rb deleted file mode 100644 index c2783be..0000000 --- a/chef/roles/os-base.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-base" -description "OpenStack Base role" -run_list( - "recipe[openstack-common]", - "recipe[openstack-common::logging]" - ) diff --git a/chef/roles/os-block-storage-api.json b/chef/roles/os-block-storage-api.json new file mode 100644 index 0000000..178bfac --- /dev/null +++ b/chef/roles/os-block-storage-api.json @@ -0,0 +1,16 @@ +{ + "name": "os-block-storage-api", + "description": "OpenStack Block Storage API service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-block-storage::api]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-block-storage-api.rb b/chef/roles/os-block-storage-api.rb deleted file mode 100644 index e0ee610..0000000 --- a/chef/roles/os-block-storage-api.rb +++ /dev/null @@ -1,23 +0,0 @@ -name "os-block-storage-api" -description "OpenStack Block Storage API service" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "cinder-api" => "/var/log/cinder/api.log" - }, - "debianloglist" => { - "cinder-api" => "/var/log/cinder/cinder-api.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-cinder-api"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-block-storage::api]" - ) diff --git a/chef/roles/os-block-storage-controller.json b/chef/roles/os-block-storage-controller.json new file mode 100644 index 0000000..6d327cd --- /dev/null +++ b/chef/roles/os-block-storage-controller.json @@ -0,0 +1,18 @@ +{ + "name": "os-block-storage-controller", + "description": "Configures OpenStack block storage controller, configured by attributes.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "role[os-block-storage-api]", + "role[os-block-storage-scheduler]", + "recipe[openstack-block-storage::identity_registration]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-block-storage-scheduler.json b/chef/roles/os-block-storage-scheduler.json new file mode 100644 index 0000000..5ff7a0d --- /dev/null +++ b/chef/roles/os-block-storage-scheduler.json @@ -0,0 +1,16 @@ +{ + "name": "os-block-storage-scheduler", + "description": "OpenStack Block Storage Scheduler service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-block-storage::scheduler]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-block-storage-scheduler.rb b/chef/roles/os-block-storage-scheduler.rb deleted file mode 100644 index 5e78e88..0000000 --- a/chef/roles/os-block-storage-scheduler.rb +++ /dev/null @@ -1,23 +0,0 @@ -name "os-block-storage-scheduler" -description "OpenStack Block Storage Scheduler service" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "cinder-scheduler" => "/var/log/cinder/scheduler.log" - }, - "debianloglist" => { - "cinder-scheduler" => "/var/log/cinder/cinder-scheduler.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-cinder-scheduler"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-block-storage::scheduler]" - ) diff --git a/chef/roles/os-block-storage-volume.json b/chef/roles/os-block-storage-volume.json new file mode 100644 index 0000000..9647d6c --- /dev/null +++ b/chef/roles/os-block-storage-volume.json @@ -0,0 +1,16 @@ +{ + "name": "os-block-storage-volume", + "description": "OpenStack Block Storage volume service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-block-storage::volume]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-block-storage-worker.rb b/chef/roles/os-block-storage-worker.rb deleted file mode 100644 index cd6ad23..0000000 --- a/chef/roles/os-block-storage-worker.rb +++ /dev/null @@ -1,23 +0,0 @@ -name "os-block-storage-worker" -description "OpenStack Block Storage worker" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "cinder-volume" => "/var/log/cinder/volume.log" - }, - "debianloglist" => { - "cinder-volume" => "/var/log/cinder/cinder-volume.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-cinder-volume", "iscsid", "multipathd"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-block-storage::volume]" - ) diff --git a/chef/roles/os-block-storage.json b/chef/roles/os-block-storage.json new file mode 100644 index 0000000..9b7e24b --- /dev/null +++ b/chef/roles/os-block-storage.json @@ -0,0 +1,19 @@ +{ + "name": "os-block-storage", + "description": "Configures OpenStack block storage, configured by attributes.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "role[os-block-storage-api]", + "role[os-block-storage-scheduler]", + "role[os-block-storage-volume]", + "recipe[openstack-block-storage::identity_registration]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-block-storage.rb b/chef/roles/os-block-storage.rb deleted file mode 100644 index f67aeed..0000000 --- a/chef/roles/os-block-storage.rb +++ /dev/null @@ -1,8 +0,0 @@ -name "os-block-storage" -description "Configures OpenStack block storage, configured by attributes." -run_list( - "role[os-base]", - "recipe[openstack-block-storage::api]", - "recipe[openstack-block-storage::scheduler]", - "recipe[openstack-block-storage::volume]" - ) diff --git a/chef/roles/os-client.json b/chef/roles/os-client.json new file mode 100644 index 0000000..d08f24a --- /dev/null +++ b/chef/roles/os-client.json @@ -0,0 +1,24 @@ +{ + "name": "os-client", + "description": "Roll-up role for client interfaces.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-common::client]", + "recipe[openstack-block-storage::client]", + "recipe[openstack-compute::client]", + "recipe[openstack-identity::client]", + "recipe[openstack-image::client]", + "recipe[openstack-network::client]", + "recipe[openstack-object-storage::client]", + "recipe[openstack-orchestration::client]", + "recipe[openstack-telemetry::client]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-api-ec2.json b/chef/roles/os-compute-api-ec2.json new file mode 100644 index 0000000..27742e6 --- /dev/null +++ b/chef/roles/os-compute-api-ec2.json @@ -0,0 +1,16 @@ +{ + "name": "os-compute-api-ec2", + "description": "EC2 API for Compute", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-compute::api-ec2]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-api-ec2.rb b/chef/roles/os-compute-api-ec2.rb deleted file mode 100644 index 10731a7..0000000 --- a/chef/roles/os-compute-api-ec2.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-compute-api-ec2" -description "EC2 API for Compute" -run_list( - "role[os-base]", - "recipe[openstack-compute::api-ec2]" - ) diff --git a/chef/roles/os-compute-api-metadata.json b/chef/roles/os-compute-api-metadata.json new file mode 100644 index 0000000..7b1ca9d --- /dev/null +++ b/chef/roles/os-compute-api-metadata.json @@ -0,0 +1,16 @@ +{ + "name": "os-compute-api-metadata", + "description": "OpenStack compute metadata API service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-compute::api-metadata]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-api-metadata.rb b/chef/roles/os-compute-api-metadata.rb deleted file mode 100644 index 87a65f1..0000000 --- a/chef/roles/os-compute-api-metadata.rb +++ /dev/null @@ -1,15 +0,0 @@ -name "os-compute-api-metadata" -description "OpenStack compute metadata API service" -override_attributes( - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-nova-metadata-api"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-compute::api-metadata]" - ) diff --git a/chef/roles/os-compute-api-os-compute.json b/chef/roles/os-compute-api-os-compute.json new file mode 100644 index 0000000..6bdf108 --- /dev/null +++ b/chef/roles/os-compute-api-os-compute.json @@ -0,0 +1,16 @@ +{ + "name": "os-compute-api-os-compute", + "description": "OpenStack API for Compute", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-compute::api-os-compute]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-api-os-compute.rb b/chef/roles/os-compute-api-os-compute.rb deleted file mode 100644 index c148ab7..0000000 --- a/chef/roles/os-compute-api-os-compute.rb +++ /dev/null @@ -1,23 +0,0 @@ -name "os-compute-api-os-compute" -description "OpenStack API for Compute" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "nova-api" => "/var/log/nova/api.log" - }, - "debianloglist" => { - "nova-api" => "/var/log/nova/nova-api.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-nova-api"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-compute::api-os-compute]" - ) diff --git a/chef/roles/os-compute-api.json b/chef/roles/os-compute-api.json new file mode 100644 index 0000000..8d04ced --- /dev/null +++ b/chef/roles/os-compute-api.json @@ -0,0 +1,19 @@ +{ + "name": "os-compute-api", + "description": "Roll-up role for all the Compute APIs", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", +// "role[os-compute-api-ec2]", + "role[os-compute-api-os-compute]", + "role[os-compute-api-metadata]", + "recipe[openstack-compute::identity_registration]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-api.rb b/chef/roles/os-compute-api.rb deleted file mode 100644 index 2db6422..0000000 --- a/chef/roles/os-compute-api.rb +++ /dev/null @@ -1,7 +0,0 @@ -name "os-compute-api" -description "Roll-up role for all the Compute APIs" -run_list( - "role[os-compute-api-ec2]", - "role[os-compute-api-os-compute]" -# "role[os-compute-api-metadata]" - ) diff --git a/chef/roles/os-compute-cert.json b/chef/roles/os-compute-cert.json new file mode 100644 index 0000000..ff1a8d7 --- /dev/null +++ b/chef/roles/os-compute-cert.json @@ -0,0 +1,16 @@ +{ + "name": "os-compute-cert", + "description": "OpenStack Compute Cert service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-compute::nova-cert]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-cert.rb b/chef/roles/os-compute-cert.rb deleted file mode 100644 index 5eb6d7b..0000000 --- a/chef/roles/os-compute-cert.rb +++ /dev/null @@ -1,15 +0,0 @@ -name "os-compute-cert" -description "OpenStack Compute Cert service" -override_attributes( - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-nova-cert"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-compute::nova-cert]" - ) diff --git a/chef/roles/os-compute-conductor.json b/chef/roles/os-compute-conductor.json new file mode 100644 index 0000000..d6a3ffd --- /dev/null +++ b/chef/roles/os-compute-conductor.json @@ -0,0 +1,16 @@ +{ + "name": "os-compute-conductor", + "description": "Nova conductor", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-compute::conductor]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-controller.json b/chef/roles/os-compute-controller.json new file mode 100644 index 0000000..6392768 --- /dev/null +++ b/chef/roles/os-compute-controller.json @@ -0,0 +1,21 @@ +{ + "name": "os-compute-controller", + "description": "Roll-up role for all of the OpenStack Compute services on a single roles", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "role[os-compute-setup]", + "role[os-compute-conductor]", + "role[os-compute-scheduler]", + "role[os-compute-api]", + "role[os-compute-cert]", + "role[os-compute-vncproxy]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-controller.rb b/chef/roles/os-compute-controller.rb deleted file mode 100644 index 4606fd2..0000000 --- a/chef/roles/os-compute-controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -name "os-compute-controller" -description "Roll-up role for all the Compute APIs" -run_list( - "role[os-base]", - "role[os-compute-api]", - "role[os-compute-scheduler]", - "role[os-compute-cert]", - "role[os-compute-vncproxy]", - "recipe[openstack-compute::conductor]", - "recipe[openstack-compute::nova-setup]" - ) diff --git a/chef/roles/os-compute-scheduler.json b/chef/roles/os-compute-scheduler.json new file mode 100644 index 0000000..7a9d774 --- /dev/null +++ b/chef/roles/os-compute-scheduler.json @@ -0,0 +1,16 @@ +{ + "name": "os-compute-scheduler", + "description": "Nova scheduler", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-compute::scheduler]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-scheduler.rb b/chef/roles/os-compute-scheduler.rb deleted file mode 100644 index 9ffa272..0000000 --- a/chef/roles/os-compute-scheduler.rb +++ /dev/null @@ -1,25 +0,0 @@ -name "os-compute-scheduler" -description "Nova scheduler" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "nova-scheduler" => "/var/log/nova/scheduler.log", - "nova-conductor" => "/var/log/nova/conductor.log" - }, - "debianloglist" => { - "nova-scheduler" => "/var/log/nova/nova-scheduler.log", - "nova-conductor" => "/var/log/nova/nova-conductor.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-nova-scheduler", "openstack-nova-conductor"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-compute::scheduler]" - ) diff --git a/chef/roles/os-compute-setup.json b/chef/roles/os-compute-setup.json new file mode 100644 index 0000000..f230885 --- /dev/null +++ b/chef/roles/os-compute-setup.json @@ -0,0 +1,17 @@ +{ + "name": "os-compute-setup", + "description": "Nova setup and identity registration", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-compute::nova-setup]", + "recipe[openstack-compute::identity_registration]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-single-controller-no-network.json b/chef/roles/os-compute-single-controller-no-network.json new file mode 100644 index 0000000..ddb19c2 --- /dev/null +++ b/chef/roles/os-compute-single-controller-no-network.json @@ -0,0 +1,28 @@ +{ + "name": "os-compute-single-controller-no-network", + "description": "Roll-up role for all of the OpenStack Compute services on a single, non-HA controller, minus any network related roles", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "role[os-ops-database]", + "recipe[openstack-ops-database::openstack-db]", + "role[os-ops-messaging]", + "role[os-identity]", + "role[os-image]", + "role[os-compute-setup]", + "role[os-compute-conductor]", + "role[os-compute-scheduler]", + "role[os-compute-api]", + "role[os-block-storage]", + "role[os-compute-cert]", + "role[os-compute-vncproxy]", + "role[os-dashboard]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-single-controller.json b/chef/roles/os-compute-single-controller.json new file mode 100644 index 0000000..40d5bde --- /dev/null +++ b/chef/roles/os-compute-single-controller.json @@ -0,0 +1,29 @@ +{ + "name": "os-compute-single-controller", + "description": "Roll-up role for all of the OpenStack Compute services on a single, non-HA controller.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "role[os-ops-database]", + "recipe[openstack-ops-database::openstack-db]", + "role[os-ops-messaging]", + "role[os-identity]", + "role[os-image]", + "role[os-network]", + "role[os-compute-setup]", + "role[os-compute-conductor]", + "role[os-compute-scheduler]", + "role[os-compute-api]", + "role[os-block-storage]", + "role[os-compute-cert]", + "role[os-compute-vncproxy]", + "role[os-dashboard]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-single-controller.rb b/chef/roles/os-compute-single-controller.rb deleted file mode 100644 index c47366a..0000000 --- a/chef/roles/os-compute-single-controller.rb +++ /dev/null @@ -1,16 +0,0 @@ -name "os-compute-single-controller" -description "Roll-up role for all of the OpenStack Compute services on a single, non-HA controller." -run_list( - "role[os-base]", - "role[os-ops-database]", - "role[os-ops-messaging]", - "role[os-identity]", - "role[os-image]", - "role[os-network]", - "role[os-compute-scheduler]", - "role[os-compute-api]", - "role[os-block-storage]", - "role[os-compute-cert]", - "role[os-compute-vncproxy]", - "role[os-dashboard]" - ) diff --git a/chef/roles/os-compute-vncproxy.json b/chef/roles/os-compute-vncproxy.json new file mode 100644 index 0000000..8693248 --- /dev/null +++ b/chef/roles/os-compute-vncproxy.json @@ -0,0 +1,16 @@ +{ + "name": "os-compute-vncproxy", + "description": "Nova VNC Proxy", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-compute::vncproxy]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-vncproxy.rb b/chef/roles/os-compute-vncproxy.rb deleted file mode 100644 index 2a1dec5..0000000 --- a/chef/roles/os-compute-vncproxy.rb +++ /dev/null @@ -1,16 +0,0 @@ -name "os-compute-vncproxy" -description "Nova VNC Proxy" -override_attributes( - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-nova-xvpvncproxy", "openstack-nova-novncproxy"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-compute::vncproxy]" - ) - diff --git a/chef/roles/os-compute-worker.json b/chef/roles/os-compute-worker.json new file mode 100644 index 0000000..bb6aab6 --- /dev/null +++ b/chef/roles/os-compute-worker.json @@ -0,0 +1,16 @@ +{ + "name": "os-compute-worker", + "description": "The compute node, most likely with a hypervisor.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-compute::compute]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-compute-worker.rb b/chef/roles/os-compute-worker.rb deleted file mode 100644 index cdf1f84..0000000 --- a/chef/roles/os-compute-worker.rb +++ /dev/null @@ -1,24 +0,0 @@ -name "os-compute-worker" -description "The compute node, most likely with a hypervisor." -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "nova-compute" => "/var/log/nova/compute.log" - }, - "debianloglist" => { - "nova-compute" => "/var/log/nova/nova-compute.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-nova-compute"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-compute::compute]" - ) - diff --git a/chef/roles/os-controller.rb b/chef/roles/os-controller.rb deleted file mode 100644 index 7338fcd..0000000 --- a/chef/roles/os-controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -name "os-controller" -description "Roll-up role for all of the OpenStack Compute services on a single, non-HA controller." -run_list( - 'role[os-dashboard]', - 'role[os-identity]', - 'role[os-identity-api]', - 'role[os-identity-api-admin]', - 'role[os-block-storage-api]', - 'role[os-block-storage-scheduler]', - 'role[os-compute-api]', - 'role[os-compute-api-os-compute]', - 'role[os-compute-cert]', - 'role[os-compute-controller]', - 'role[os-compute-scheduler]', -# 'role[os-compute-vncproxy]', - 'role[os-network-server]' - ) diff --git a/chef/roles/os-dashboard.json b/chef/roles/os-dashboard.json new file mode 100644 index 0000000..70415e7 --- /dev/null +++ b/chef/roles/os-dashboard.json @@ -0,0 +1,17 @@ +{ + "name": "os-dashboard", + "description": "Horizon server", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "recipe[memcached]", + "role[os-base]", + "recipe[openstack-dashboard::server]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-dashboard.rb b/chef/roles/os-dashboard.rb deleted file mode 100644 index 23f64ab..0000000 --- a/chef/roles/os-dashboard.rb +++ /dev/null @@ -1,16 +0,0 @@ -name "os-dashboard" -description "Horizon server" -override_attributes( - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["httpd"]} - } - } - } -) -run_list( - "role[os-base]", -# "recipe[openstack-dashboard::db]", - "recipe[openstack-dashboard::server]" - ) diff --git a/chef/roles/os-ha.rb b/chef/roles/os-ha.rb deleted file mode 100644 index a8c8ea4..0000000 --- a/chef/roles/os-ha.rb +++ /dev/null @@ -1,15 +0,0 @@ -name "os-ha" -description "Software load banance" -override_attributes( - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["haproxy", "keepalived"]} - } - } - } -) -run_list( - "recipe[keepalived]", - "recipe[haproxy::tcp_lb]" - ) diff --git a/chef/roles/os-identity-api-admin.rb b/chef/roles/os-identity-api-admin.rb deleted file mode 100644 index 86e46cf..0000000 --- a/chef/roles/os-identity-api-admin.rb +++ /dev/null @@ -1,7 +0,0 @@ -name "os-identity-api-admin" -description "Keystone admin API service" -run_list( - "role[os-base]", - "recipe[openstack-identity::server]" - ) - diff --git a/chef/roles/os-identity-api.rb b/chef/roles/os-identity-api.rb deleted file mode 100644 index 96d7db9..0000000 --- a/chef/roles/os-identity-api.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-identity-api" -description "Keystone API service" -run_list( - "role[os-base]", - "recipe[openstack-identity::server]" - ) diff --git a/chef/roles/os-identity.json b/chef/roles/os-identity.json new file mode 100644 index 0000000..a494ded --- /dev/null +++ b/chef/roles/os-identity.json @@ -0,0 +1,17 @@ +{ + "name": "os-identity", + "description": "Roll-up role for Identity", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-identity::server]", + "recipe[openstack-identity::registration]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-identity.rb b/chef/roles/os-identity.rb deleted file mode 100644 index 7faf10b..0000000 --- a/chef/roles/os-identity.rb +++ /dev/null @@ -1,24 +0,0 @@ -name "os-identity" -description "Roll-up role for Identity" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "keystone" => "/var/log/keystone/keystone.log" - }, - "debianloglist" => { - "keystone" => "/var/log/keystone/keystone.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-keystone"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-identity::server]", - "recipe[openstack-identity::registration]" - ) diff --git a/chef/roles/os-image-api.json b/chef/roles/os-image-api.json new file mode 100644 index 0000000..1466eb3 --- /dev/null +++ b/chef/roles/os-image-api.json @@ -0,0 +1,16 @@ +{ + "name": "os-image-api", + "description": "Glance API service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-image::api]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-image-api.rb b/chef/roles/os-image-api.rb deleted file mode 100644 index cb7014f..0000000 --- a/chef/roles/os-image-api.rb +++ /dev/null @@ -1,25 +0,0 @@ -name "os-image-api" -description "Glance API service" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "glance-api" => "/var/log/glance/api.log" - }, - "debianloglist" => { - "glance-api" => "/var/log/glance/api.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-glance-api"] } - } - } - } -) -run_list( - "role[os-base]", - #"recipe[openstack-image::db]", - "recipe[openstack-image::api]" - ) - diff --git a/chef/roles/os-image-registry.json b/chef/roles/os-image-registry.json new file mode 100644 index 0000000..6a3bc26 --- /dev/null +++ b/chef/roles/os-image-registry.json @@ -0,0 +1,16 @@ +{ + "name": "os-image-registry", + "description": "Glance Registry service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-image::registry]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-image-registry.rb b/chef/roles/os-image-registry.rb deleted file mode 100644 index b79ecdf..0000000 --- a/chef/roles/os-image-registry.rb +++ /dev/null @@ -1,25 +0,0 @@ -name "os-image-registry" -description "Glance Registry service" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "glance-registry" => "/var/log/glance/registry.log" - }, - "debianloglist" => { - "glance-registry" => "/var/log/glance/registry.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["openstack-glance-registry"] } - } - } - } -) -run_list( - "role[os-base]", - #"recipe[openstack-image::db]", - "recipe[openstack-image::registry]" - ) - diff --git a/chef/roles/os-image-upload.json b/chef/roles/os-image-upload.json new file mode 100644 index 0000000..163f239 --- /dev/null +++ b/chef/roles/os-image-upload.json @@ -0,0 +1,16 @@ +{ + "name": "os-image-upload", + "description": "Glance image upload", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-image::image_upload]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-image.json b/chef/roles/os-image.json new file mode 100644 index 0000000..1d5b4de --- /dev/null +++ b/chef/roles/os-image.json @@ -0,0 +1,18 @@ +{ + "name": "os-image", + "description": "Roll-up role for Glance.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-image-api]", + "role[os-image-registry]", + "recipe[openstack-image::identity_registration]", + "role[os-image-upload]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-image.rb b/chef/roles/os-image.rb deleted file mode 100644 index 8299fa8..0000000 --- a/chef/roles/os-image.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-image" -description "Roll-up role for Glance." -run_list( - "role[os-image-registry]", - "role[os-image-api]" - ) diff --git a/chef/roles/os-infra-caching.rb b/chef/roles/os-infra-caching.rb deleted file mode 100644 index 478227a..0000000 --- a/chef/roles/os-infra-caching.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-infra-caching" -description "Memcached role for Openstack" -run_list( - "role[os-base]", - "recipe[memcached::default]" - ) diff --git a/chef/roles/os-network-dhcp-agent.json b/chef/roles/os-network-dhcp-agent.json new file mode 100644 index 0000000..b0c19e1 --- /dev/null +++ b/chef/roles/os-network-dhcp-agent.json @@ -0,0 +1,16 @@ +{ + "name": "os-network-dhcp-agent", + "description": "OpenStack network dhcp-agent service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-network::dhcp_agent]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-network-l3-agent.json b/chef/roles/os-network-l3-agent.json new file mode 100644 index 0000000..5e1af4c --- /dev/null +++ b/chef/roles/os-network-l3-agent.json @@ -0,0 +1,16 @@ +{ + "name": "os-network-l3-agent", + "description": "OpenStack network l3-agent service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-network::l3_agent]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-network-metadata-agent.json b/chef/roles/os-network-metadata-agent.json new file mode 100644 index 0000000..ced91ad --- /dev/null +++ b/chef/roles/os-network-metadata-agent.json @@ -0,0 +1,16 @@ +{ + "name": "os-network-metadata-agent", + "description": "OpenStack network metadata-agent service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-network::metadata_agent]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-network-openvswitch.json b/chef/roles/os-network-openvswitch.json new file mode 100644 index 0000000..aa63b7b --- /dev/null +++ b/chef/roles/os-network-openvswitch.json @@ -0,0 +1,16 @@ +{ + "name": "os-network-openvswitch", + "description": "OpenStack network openvswitch service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-network::openvswitch]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-network-server.json b/chef/roles/os-network-server.json new file mode 100644 index 0000000..5cac24b --- /dev/null +++ b/chef/roles/os-network-server.json @@ -0,0 +1,17 @@ +{ + "name": "os-network-server", + "description": "OpenStack network server service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-network::identity_registration]", + "recipe[openstack-network::server]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-network-server.rb b/chef/roles/os-network-server.rb deleted file mode 100644 index e2f894c..0000000 --- a/chef/roles/os-network-server.rb +++ /dev/null @@ -1,23 +0,0 @@ -name "os-network-server" -description "Configures OpenStack networking, managed by attribute for either nova-network or quantum" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "quantum-server" => "/var/log/quantum/server.log" - }, - "rhelloglist" => { - "quantum-server" => "/var/log/quantum/server.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["quantum-server"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-network::server]" - ) diff --git a/chef/roles/os-network-worker.json b/chef/roles/os-network-worker.json new file mode 100644 index 0000000..127e29f --- /dev/null +++ b/chef/roles/os-network-worker.json @@ -0,0 +1,19 @@ +{ + "name": "os-network-worker", + "description": "Configures OpenStack networking node, managed by neutron.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "role[os-network-openvswitch]", + "role[os-network-l3-agent]", + "role[os-network-dhcp-agent]", + "role[os-network-metadata-agent]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-network.json b/chef/roles/os-network.json new file mode 100644 index 0000000..0676016 --- /dev/null +++ b/chef/roles/os-network.json @@ -0,0 +1,21 @@ +{ + "name": "os-network", + "description": "Configures OpenStack networking, managed by attribute for either nova-network or neutron.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-network::identity_registration]", + "role[os-network-openvswitch]", + "role[os-network-l3-agent]", + "role[os-network-dhcp-agent]", + "role[os-network-metadata-agent]", + "role[os-network-server]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-network.rb b/chef/roles/os-network.rb deleted file mode 100644 index 0083344..0000000 --- a/chef/roles/os-network.rb +++ /dev/null @@ -1,30 +0,0 @@ -name "os-network" -description "Configures OpenStack networking, managed by attribute for either nova-network or quantum" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "quantum-ovsagent" => "/var/log/quantum/openvswitch-agent.log", - "quantum-dhcp" => "/var/log/quantum/dhcp-agent.log", - "quantum-l3agent" => "/var/log/quantum/l3-agent.log" - }, - "debianloglist" => { - "quantum-ovsagent" => "/var/log/quantum/openvswitch-agent.log", - "quantum-dhcp" => "/var/log/quantum/dhcp-agent.log", - "quantum-l3agent" => "/var/log/quantum/l3-agent.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["quantum-dhcp-agent", "quantum-l3-agent", "quantum-openvswitch-agent", "quantum-metadata-agent"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-network::openvswitch]", - "recipe[openstack-network::l3_agent]", - "recipe[openstack-network::dhcp_agent]", - "recipe[openstack-network::metadata_agent]" - ) diff --git a/chef/roles/os-object-storage-account.json b/chef/roles/os-object-storage-account.json new file mode 100644 index 0000000..6027507 --- /dev/null +++ b/chef/roles/os-object-storage-account.json @@ -0,0 +1,16 @@ +{ + "name": "os-object-storage-account", + "description": "OpenStack object storage account service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-object-storage::account]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-object-storage-account.rb b/chef/roles/os-object-storage-account.rb deleted file mode 100644 index 7e59eed..0000000 --- a/chef/roles/os-object-storage-account.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-object-storage-account" -description "OpenStack object storage account service" -run_list( - "role[os-base]", - "recipe[openstack-object-storage::account]" - ) diff --git a/chef/roles/os-object-storage-container.json b/chef/roles/os-object-storage-container.json new file mode 100644 index 0000000..494d4cb --- /dev/null +++ b/chef/roles/os-object-storage-container.json @@ -0,0 +1,16 @@ +{ + "name": "os-object-storage-container", + "description": "OpenStack object storage container service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-object-storage::container]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-object-storage-container.rb b/chef/roles/os-object-storage-container.rb deleted file mode 100644 index 5ee8098..0000000 --- a/chef/roles/os-object-storage-container.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-object-storage-container" -description "OpenStack object storage container service" -run_list( - "role[os-base]", - "recipe[openstack-object-storage::container]" - ) diff --git a/chef/roles/os-object-storage-management.json b/chef/roles/os-object-storage-management.json new file mode 100644 index 0000000..27aa232 --- /dev/null +++ b/chef/roles/os-object-storage-management.json @@ -0,0 +1,16 @@ +{ + "name": "os-object-storage-management", + "description": "OpenStack object storage management service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-object-storage::management]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-object-storage-management.rb b/chef/roles/os-object-storage-management.rb deleted file mode 100644 index 90399c3..0000000 --- a/chef/roles/os-object-storage-management.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-object-storage-management" -description "OpenStack object storage management service" -run_list( - "role[os-base]", - "recipe[openstack-object-storage::management]" - ) diff --git a/chef/roles/os-object-storage-object.json b/chef/roles/os-object-storage-object.json new file mode 100644 index 0000000..47806e4 --- /dev/null +++ b/chef/roles/os-object-storage-object.json @@ -0,0 +1,16 @@ +{ + "name": "os-object-storage-object", + "description": "OpenStack object storage object service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-object-storage::object]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-object-storage-object.rb b/chef/roles/os-object-storage-object.rb deleted file mode 100644 index 1d15727..0000000 --- a/chef/roles/os-object-storage-object.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-object-storage-object" -description "OpenStack object storage object service" -run_list( - "role[os-base]", - "recipe[openstack-object-storage::object]" - ) diff --git a/chef/roles/os-object-storage-proxy.json b/chef/roles/os-object-storage-proxy.json new file mode 100644 index 0000000..e5c8264 --- /dev/null +++ b/chef/roles/os-object-storage-proxy.json @@ -0,0 +1,16 @@ +{ + "name": "os-object-storage-proxy", + "description": "OpenStack object storage proxy service", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-object-storage::proxy-server]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-object-storage-proxy.rb b/chef/roles/os-object-storage-proxy.rb deleted file mode 100644 index da660a7..0000000 --- a/chef/roles/os-object-storage-proxy.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-object-storage-proxy" -description "OpenStack object storage proxy service" -run_list( - "role[os-base]", - "recipe[openstack-object-storage::proxy]" - ) diff --git a/chef/roles/os-object-storage.json b/chef/roles/os-object-storage.json new file mode 100644 index 0000000..82e1c44 --- /dev/null +++ b/chef/roles/os-object-storage.json @@ -0,0 +1,20 @@ +{ + "name": "os-object-storage", + "description": "OpenStack object storage roll-up role", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "role[os-object-storage-account]", + "role[os-object-storage-container]", + "role[os-object-storage-management]", + "role[os-object-storage-object]", + "role[os-object-storage-proxy]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-object-storage.rb b/chef/roles/os-object-storage.rb deleted file mode 100644 index 2a06fc2..0000000 --- a/chef/roles/os-object-storage.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "os-object-storage" -description "OpenStack object storage roll-up role" -run_list( - "role[os-base]", - "recipe[openstack-object-storage]" - ) diff --git a/chef/roles/os-ops-caching.json b/chef/roles/os-ops-caching.json new file mode 100644 index 0000000..86d2f95 --- /dev/null +++ b/chef/roles/os-ops-caching.json @@ -0,0 +1,16 @@ +{ + "name": "os-ops-caching", + "description": "Installs memcache server", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[memcached]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-ops-database.json b/chef/roles/os-ops-database.json new file mode 100644 index 0000000..2196dea --- /dev/null +++ b/chef/roles/os-ops-database.json @@ -0,0 +1,17 @@ +{ + "name": "os-ops-database", + "description": "Currently MySQL Server (non-ha)", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-ops-database::server]", + "recipe[openstack-ops-database::openstack-db]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-ops-database.rb b/chef/roles/os-ops-database.rb deleted file mode 100644 index 7388caa..0000000 --- a/chef/roles/os-ops-database.rb +++ /dev/null @@ -1,24 +0,0 @@ -name "os-ops-database" -description "Currently MySQL Server (non-ha)" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "mysqld" => "/var/log/mysqld.log" - }, - "debianloglist" => { - "mysqld" => "/var/log/mysql.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["mysqld"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-ops-database::server]", - "recipe[openstack-ops-database::openstack-db]" - ) diff --git a/chef/roles/os-ops-messaging.json b/chef/roles/os-ops-messaging.json new file mode 100644 index 0000000..e07fad8 --- /dev/null +++ b/chef/roles/os-ops-messaging.json @@ -0,0 +1,16 @@ +{ + "name": "os-ops-messaging", + "description": "Currently RabbitMQ Server (non-ha)", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-ops-messaging::server]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-ops-messaging.rb b/chef/roles/os-ops-messaging.rb deleted file mode 100644 index 0b679c5..0000000 --- a/chef/roles/os-ops-messaging.rb +++ /dev/null @@ -1,23 +0,0 @@ -name "os-ops-messaging" -description "Currently RabbitMQ Server (non-ha)" -override_attributes( - "rsyslog" => { - "rhelloglist" => { - "rabbitmq" => "/var/log/rabbitmq/rabbit\@$hostname.log" - }, - "debianloglist" => { - "rabbitmq" => "/var/log/rabbitmq/rabbit\@$hostname.log" - } - }, - "collectd" => { - "rhel" => { - "plugins" => { - "processes" => { "Process" => ["rabbitmq-server"] } - } - } - } -) -run_list( - "role[os-base]", - "recipe[openstack-ops-messaging::server]" - ) diff --git a/chef/roles/os-orchestration-api-cfn.json b/chef/roles/os-orchestration-api-cfn.json new file mode 100644 index 0000000..0b38c4e --- /dev/null +++ b/chef/roles/os-orchestration-api-cfn.json @@ -0,0 +1,16 @@ +{ + "name": "os-orchestration-api-cfn", + "description": "Role for Heat CloudFormation Api Service.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-orchestration::api-cfn]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-orchestration-api-cloudwatch.json b/chef/roles/os-orchestration-api-cloudwatch.json new file mode 100644 index 0000000..39f9d80 --- /dev/null +++ b/chef/roles/os-orchestration-api-cloudwatch.json @@ -0,0 +1,16 @@ +{ + "name": "os-orchestration-api-cloudwatch", + "description": "Role for Heat CloudWatch Api Service.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-orchestration::api-cloudwatch]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-orchestration-api.json b/chef/roles/os-orchestration-api.json new file mode 100644 index 0000000..33fad1d --- /dev/null +++ b/chef/roles/os-orchestration-api.json @@ -0,0 +1,16 @@ +{ + "name": "os-orchestration-api", + "description": "Role for Heat Api Service.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-orchestration::api]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-orchestration-engine.json b/chef/roles/os-orchestration-engine.json new file mode 100644 index 0000000..bebbf00 --- /dev/null +++ b/chef/roles/os-orchestration-engine.json @@ -0,0 +1,16 @@ +{ + "name": "os-orchestration-engine", + "description": "Role for Heat Engine Service.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-orchestration::engine]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-orchestration.json b/chef/roles/os-orchestration.json new file mode 100644 index 0000000..5d89edb --- /dev/null +++ b/chef/roles/os-orchestration.json @@ -0,0 +1,19 @@ +{ + "name": "os-orchestration", + "description": "Role for Heat.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "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]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-single-controller.rb b/chef/roles/os-single-controller.rb deleted file mode 100644 index 88ad74f..0000000 --- a/chef/roles/os-single-controller.rb +++ /dev/null @@ -1,18 +0,0 @@ -name "os-single-controller" -description "Roll-up role for all of the OpenStack Compute services on a single, non-HA controller." -run_list( - "role[os-base]", - "role[os-ops-database]", - "role[os-ops-messaging]", - "role[os-identity]", - "role[os-image]", - "role[os-network-server]", - "role[os-block-storage]", - "role[os-compute-scheduler]", - "role[os-compute-api]", - "recipe[openstack-compute::conductor]", - "recipe[openstack-compute::nova-setup]", - "role[os-compute-cert]", - "role[os-compute-vncproxy]", - "role[os-dashboard]" - ) diff --git a/chef/roles/os-telemetry-agent-central.json b/chef/roles/os-telemetry-agent-central.json new file mode 100644 index 0000000..ba6d822 --- /dev/null +++ b/chef/roles/os-telemetry-agent-central.json @@ -0,0 +1,17 @@ +{ + "name": "os-telemetry-agent-central", + "description": "agent-central for telemetry", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-telemetry::identity_registration]", + "recipe[openstack-telemetry::agent-central]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-telemetry-agent-compute.json b/chef/roles/os-telemetry-agent-compute.json new file mode 100644 index 0000000..e8630f8 --- /dev/null +++ b/chef/roles/os-telemetry-agent-compute.json @@ -0,0 +1,17 @@ +{ + "name": "os-telemetry-agent-compute", + "description": "agent-compute for telemetry", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-telemetry::identity_registration]", + "recipe[openstack-telemetry::agent-compute]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-telemetry-agent-notification.json b/chef/roles/os-telemetry-agent-notification.json new file mode 100644 index 0000000..20857aa --- /dev/null +++ b/chef/roles/os-telemetry-agent-notification.json @@ -0,0 +1,17 @@ +{ + "name": "os-telemetry-agent-notification", + "description": "agent notification for telemetry", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-telemetry::identity_registration]", + "recipe[openstack-telemetry::agent-notification]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-telemetry-alarm-evaluator.json b/chef/roles/os-telemetry-alarm-evaluator.json new file mode 100644 index 0000000..8badff1 --- /dev/null +++ b/chef/roles/os-telemetry-alarm-evaluator.json @@ -0,0 +1,17 @@ +{ + "name": "os-telemetry-alarm-evaluator", + "description": "alarm evaluator for telemetry", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-telemetry::identity_registration]", + "recipe[openstack-telemetry::alarm-evaluator]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-telemetry-alarm-notifier.json b/chef/roles/os-telemetry-alarm-notifier.json new file mode 100644 index 0000000..39b6464 --- /dev/null +++ b/chef/roles/os-telemetry-alarm-notifier.json @@ -0,0 +1,17 @@ +{ + "name": "os-telemetry-alarm-notifier", + "description": "alarm notifier for telemetry", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-telemetry::identity_registration]", + "recipe[openstack-telemetry::alarm-notifier]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-telemetry-api.json b/chef/roles/os-telemetry-api.json new file mode 100644 index 0000000..549b933 --- /dev/null +++ b/chef/roles/os-telemetry-api.json @@ -0,0 +1,17 @@ +{ + "name": "os-telemetry-api", + "description": "api for telemetry", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-telemetry::identity_registration]", + "recipe[openstack-telemetry::api]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-telemetry-collector.json b/chef/roles/os-telemetry-collector.json new file mode 100644 index 0000000..dacfde5 --- /dev/null +++ b/chef/roles/os-telemetry-collector.json @@ -0,0 +1,17 @@ +{ + "name": "os-telemetry-collector", + "description": "collector for telemetry", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-base]", + "recipe[openstack-telemetry::identity_registration]", + "recipe[openstack-telemetry::collector]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/os-telemetry.json b/chef/roles/os-telemetry.json new file mode 100644 index 0000000..ecfc681 --- /dev/null +++ b/chef/roles/os-telemetry.json @@ -0,0 +1,21 @@ +{ + "name": "os-telemetry", + "description": "Role for Ceilometer.", + "json_class": "Chef::Role", + "default_attributes": { + }, + "override_attributes": { + }, + "chef_type": "role", + "run_list": [ + "role[os-telemetry-agent-central]", + "role[os-telemetry-agent-compute]", + "role[os-telemetry-agent-notification]", + "role[os-telemetry-alarm-evaluator]", + "role[os-telemetry-alarm-notifier]", + "role[os-telemetry-collector]", + "role[os-telemetry-api]" + ], + "env_run_lists": { + } +} diff --git a/chef/roles/test-synclog.rb b/chef/roles/test-synclog.rb deleted file mode 100644 index 45726c7..0000000 --- a/chef/roles/test-synclog.rb +++ /dev/null @@ -1,6 +0,0 @@ -name "test-synclog" -description "Sync application related logs for debugging" -run_list( - "recipe[rsyslog::client]", - "recipe[collectd::client]" - )