From d8a96b8a1e5e497211a5d38634cbcf2f2228eb85 Mon Sep 17 00:00:00 2001
From: "grace.yu" <xinyu@huawei.com>
Date: Mon, 6 Oct 2014 16:02:22 -0700
Subject: [PATCH] update roles for ceph-openstack

Change-Id: I439b8d6e10edabfabec47ccf72ba3d0374b906fb
---
 chef/roles/ceph-os-block-config.json         | 15 ------------
 chef/roles/ceph-os-compute-config.json       | 15 ------------
 chef/roles/ceph-os-image-config.json         | 15 ------------
 chef/roles/ceph-os-mon.json                  |  9 +++++++
 chef/roles/ceph-os-object-config.json        | 16 -------------
 chef/roles/ceph-os-radosgw.json              |  9 +++++++
 chef/roles/openstack_config_mon.json         |  8 -------
 chef/roles/openstack_config_radosgw.json     |  8 -------
 chef/roles/os-ceph-block-storage-volume.json | 25 ++++++++++++++++++++
 chef/roles/os-ceph-compute-worker.json       | 25 ++++++++++++++++++++
 chef/roles/os-ceph-image.json                |  2 +-
 chef/roles/os-ceph-object-storage.json       | 22 +++++++++++++++++
 12 files changed, 91 insertions(+), 78 deletions(-)
 delete mode 100644 chef/roles/ceph-os-block-config.json
 delete mode 100644 chef/roles/ceph-os-compute-config.json
 delete mode 100644 chef/roles/ceph-os-image-config.json
 create mode 100644 chef/roles/ceph-os-mon.json
 delete mode 100644 chef/roles/ceph-os-object-config.json
 create mode 100644 chef/roles/ceph-os-radosgw.json
 delete mode 100644 chef/roles/openstack_config_mon.json
 delete mode 100644 chef/roles/openstack_config_radosgw.json
 create mode 100644 chef/roles/os-ceph-block-storage-volume.json
 create mode 100644 chef/roles/os-ceph-compute-worker.json
 create mode 100644 chef/roles/os-ceph-object-storage.json

diff --git a/chef/roles/ceph-os-block-config.json b/chef/roles/ceph-os-block-config.json
deleted file mode 100644
index 5441a8d..0000000
--- a/chef/roles/ceph-os-block-config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "ceph-os-block-config",
-  "description": "OpenStack Base role",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "recipe[openstack-block-storage::cinder-config-ceph]"
-  ],
-  "env_run_lists": {
-  }
-}
diff --git a/chef/roles/ceph-os-compute-config.json b/chef/roles/ceph-os-compute-config.json
deleted file mode 100644
index a98f2c6..0000000
--- a/chef/roles/ceph-os-compute-config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "ceph-os-compute-config",
-  "description": "Ceph-OpenStack compute config role",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "recipe[openstack-compute::compute-config-ceph]"
-  ],
-  "env_run_lists": {
-  }
-}
diff --git a/chef/roles/ceph-os-image-config.json b/chef/roles/ceph-os-image-config.json
deleted file mode 100644
index a8eb895..0000000
--- a/chef/roles/ceph-os-image-config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "ceph-os-image-config",
-  "description": "Ceph-OpenStack image config role",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "recipe[openstack-image::glance-config-ceph]"
-  ],
-  "env_run_lists": {
-  }
-}
diff --git a/chef/roles/ceph-os-mon.json b/chef/roles/ceph-os-mon.json
new file mode 100644
index 0000000..82c078f
--- /dev/null
+++ b/chef/roles/ceph-os-mon.json
@@ -0,0 +1,9 @@
+{
+  "name": "ceph-os-mon",
+  "description": "Ceph Monitor compatiable with OpenStack Icehouse",
+  "run_list": [
+    "recipe[ceph::repo]",
+    "recipe[ceph::mon]",
+    "recipe[ceph::openstack_config_mon]"
+  ]
+}
diff --git a/chef/roles/ceph-os-object-config.json b/chef/roles/ceph-os-object-config.json
deleted file mode 100644
index 648fe49..0000000
--- a/chef/roles/ceph-os-object-config.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "ceph-os-object-config",
-  "description": "Ceph-OpenStack object storage config role",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "recipe[openstack-object-storage::swift-config-ceph]",
-    "recipe[openstack-object-storage::swiftclient-patch]"
-  ],
-  "env_run_lists": {
-  }
-}
diff --git a/chef/roles/ceph-os-radosgw.json b/chef/roles/ceph-os-radosgw.json
new file mode 100644
index 0000000..550df0f
--- /dev/null
+++ b/chef/roles/ceph-os-radosgw.json
@@ -0,0 +1,9 @@
+{
+  "name": "ceph-os-radosgw",
+  "description": "Ceph RADOS Gateway compatiable with OpenStack Icehouse",
+  "run_list": [
+    "recipe[ceph::repo]",
+    "recipe[ceph::radosgw]",
+    "recipe[ceph::openstack_config_radosgw]"
+  ]
+}
diff --git a/chef/roles/openstack_config_mon.json b/chef/roles/openstack_config_mon.json
deleted file mode 100644
index f099c74..0000000
--- a/chef/roles/openstack_config_mon.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "openstack_config_mon",
-  "description": "openstack_config_mon",
-  "run_list": [
-    "recipe[ceph::repo]",
-    "recipe[ceph::openstack_config_mon]"
-  ]
-}
diff --git a/chef/roles/openstack_config_radosgw.json b/chef/roles/openstack_config_radosgw.json
deleted file mode 100644
index e75ab92..0000000
--- a/chef/roles/openstack_config_radosgw.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "openstack_config_radosgw",
-  "description": "openstack_config_radosgw",
-  "run_list": [
-    "recipe[ceph::repo]",
-    "recipe[ceph::openstack_config_radosgw]"
-  ]
-}
diff --git a/chef/roles/os-ceph-block-storage-volume.json b/chef/roles/os-ceph-block-storage-volume.json
new file mode 100644
index 0000000..47e1e30
--- /dev/null
+++ b/chef/roles/os-ceph-block-storage-volume.json
@@ -0,0 +1,25 @@
+{
+  "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-worker.json b/chef/roles/os-ceph-compute-worker.json
new file mode 100644
index 0000000..a9ae170
--- /dev/null
+++ b/chef/roles/os-ceph-compute-worker.json
@@ -0,0 +1,25 @@
+{
+  "name": "os-ceph-compute-worker",
+  "description": "The compute node compatiable with Ceph, most likely with a hypervisor.",
+  "json_class": "Chef::Role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+    "collectd": {
+      "rhel": {
+        "plugins": {
+          "processes": {"ProcessMatch": ["nova-compute\" \"nova-compute"]}
+        }
+      }
+    }
+  },
+  "chef_type": "role",
+  "run_list": [
+    "role[os-base]",
+    "recipe[openstack-compute::compute]",
+    "recipe[openssh::passwordless]",
+    "recipe[openstack-compute::compute-config-ceph]"
+  ],
+  "env_run_lists": {
+  }
+}
diff --git a/chef/roles/os-ceph-image.json b/chef/roles/os-ceph-image.json
index 8d97a58..540b3aa 100644
--- a/chef/roles/os-ceph-image.json
+++ b/chef/roles/os-ceph-image.json
@@ -11,7 +11,7 @@
     "role[os-image-api]",
     "role[os-image-registry]",
     "recipe[openstack-image::identity_registration]",
-    "role[ceph-os-image-config]",
+    "recipe[openstack-image::glance-config-ceph]",
     "role[os-image-upload]"
   ],
   "env_run_lists": {
diff --git a/chef/roles/os-ceph-object-storage.json b/chef/roles/os-ceph-object-storage.json
new file mode 100644
index 0000000..72779f8
--- /dev/null
+++ b/chef/roles/os-ceph-object-storage.json
@@ -0,0 +1,22 @@
+{
+  "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": {
+  }
+}