From 98ca8d4ed577b1ad404f3581269aadb77b33f78f Mon Sep 17 00:00:00 2001
From: "grace.yu" <xinyu@huawei.com>
Date: Wed, 8 Oct 2014 11:35:38 -0700
Subject: [PATCH] modify roles for ceph+openstack

Change-Id: I8eda7b02c91aad05dead38db1d9041d12a27de31
---
 .../os-ceph-block-storage-controller.json     | 19 ++++++++++++++
 chef/roles/os-ceph-block-storage-volume.json  | 25 -------------------
 chef/roles/os-ceph-compute-controller.json    | 24 ------------------
 chef/roles/os-ceph-controller.json            | 23 +++++++++++++++++
 chef/roles/os-ceph-object-storage.json        | 22 ----------------
 5 files changed, 42 insertions(+), 71 deletions(-)
 create mode 100644 chef/roles/os-ceph-block-storage-controller.json
 delete mode 100644 chef/roles/os-ceph-block-storage-volume.json
 delete mode 100644 chef/roles/os-ceph-compute-controller.json
 create mode 100644 chef/roles/os-ceph-controller.json
 delete mode 100644 chef/roles/os-ceph-object-storage.json

diff --git a/chef/roles/os-ceph-block-storage-controller.json b/chef/roles/os-ceph-block-storage-controller.json
new file mode 100644
index 0000000..c8b48fa
--- /dev/null
+++ b/chef/roles/os-ceph-block-storage-controller.json
@@ -0,0 +1,19 @@
+{
+  "name": "os-ceph-block-storage-controller",
+  "description": "Configures OpenStack block storage controller compatiable with Ceph, 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]",
+    "recipe[openstack-block-storage::cinder-config-ceph]"
+  ],
+  "env_run_lists": {
+  }
+}
diff --git a/chef/roles/os-ceph-block-storage-volume.json b/chef/roles/os-ceph-block-storage-volume.json
deleted file mode 100644
index 47e1e30..0000000
--- a/chef/roles/os-ceph-block-storage-volume.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "os-ceph-block-storage-volume",
-  "description": "OpenStack Block Storage volume service compatiable with Ceph",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-    "collectd": {
-      "rhel": {
-        "plugins": {
-          "processes": {"ProcessMatch": ["cinder-volume\" \"cinder-volume", "iscsid\" \"iscsid", 
-                                        "multipathd\" \"multipathd"]}
-        }
-      }
-    }
-  },
-  "chef_type": "role",
-  "run_list": [
-    "role[os-base]",
-    "recipe[openstack-block-storage::volume]",
-    "recipe[openstack-block-storage::cinder-config-ceph]"
-  ],
-  "env_run_lists": {
-  }
-}
diff --git a/chef/roles/os-ceph-compute-controller.json b/chef/roles/os-ceph-compute-controller.json
deleted file mode 100644
index 07312d5..0000000
--- a/chef/roles/os-ceph-compute-controller.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "os-ceph-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]",
-    "role[os-compute-api-metadata]",
-    "recipe[openstack-object-storage::swift-config-ceph]",                     
-    "recipe[openstack-object-storage::swiftclient-patch]"
-  ],
-  "env_run_lists": {
-  }
-}
diff --git a/chef/roles/os-ceph-controller.json b/chef/roles/os-ceph-controller.json
new file mode 100644
index 0000000..7d5cb05
--- /dev/null
+++ b/chef/roles/os-ceph-controller.json
@@ -0,0 +1,23 @@
+{
+  "name": "os-ceph-controller",
+  "description": "Roll-up role for all of the OpenStack services on a controller.",
+  "json_class": "Chef::Role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
+  "chef_type": "role",
+  "run_list": [
+    "role[os-ops-database]",
+    "role[os-ops-messaging]",
+    "role[os-identity]",
+    "role[os-ceph-image]",
+    "role[os-dashboard]",
+    "role[os-compute-controller]",
+    "role[os-ceph-block-storage-controller]",
+    "role[os-block-storage-volume]",
+    "role[os-network-server]"
+  ],
+  "env_run_lists": {
+  }
+}
diff --git a/chef/roles/os-ceph-object-storage.json b/chef/roles/os-ceph-object-storage.json
deleted file mode 100644
index 72779f8..0000000
--- a/chef/roles/os-ceph-object-storage.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "os-ceph-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]",
-    "recipe[openstack-object-storage::swift-config-ceph]",
-    "recipe[openstack-object-storage::swiftclient-patch]"
-  ],
-  "env_run_lists": {
-  }
-}