From c948e19b77f212f22350d95cad0b31ceebb3e35d Mon Sep 17 00:00:00 2001
From: Weidong Shao <weidong.shao@huawei.com>
Date: Thu, 2 Oct 2014 22:09:07 +0000
Subject: [PATCH] Add roles for Ceph and Openstack integration

Change-Id: I5742ce86e1f7551cca168a984c4d0b2e59648588
---
 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-object-config.json    | 16 ++++++++++++++++
 chef/roles/openstack_config_mon.json     |  8 ++++++++
 chef/roles/openstack_config_radosgw.json |  8 ++++++++
 chef/roles/os-compute-controller.json    |  3 ++-
 chef/roles/os-compute-worker.json        |  3 ++-
 8 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 chef/roles/ceph-os-block-config.json
 create mode 100644 chef/roles/ceph-os-compute-config.json
 create mode 100644 chef/roles/ceph-os-image-config.json
 create mode 100644 chef/roles/ceph-os-object-config.json
 create mode 100644 chef/roles/openstack_config_mon.json
 create mode 100644 chef/roles/openstack_config_radosgw.json

diff --git a/chef/roles/ceph-os-block-config.json b/chef/roles/ceph-os-block-config.json
new file mode 100644
index 0000000..5441a8d
--- /dev/null
+++ b/chef/roles/ceph-os-block-config.json
@@ -0,0 +1,15 @@
+{
+  "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
new file mode 100644
index 0000000..a98f2c6
--- /dev/null
+++ b/chef/roles/ceph-os-compute-config.json
@@ -0,0 +1,15 @@
+{
+  "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
new file mode 100644
index 0000000..a8eb895
--- /dev/null
+++ b/chef/roles/ceph-os-image-config.json
@@ -0,0 +1,15 @@
+{
+  "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-object-config.json b/chef/roles/ceph-os-object-config.json
new file mode 100644
index 0000000..648fe49
--- /dev/null
+++ b/chef/roles/ceph-os-object-config.json
@@ -0,0 +1,16 @@
+{
+  "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/openstack_config_mon.json b/chef/roles/openstack_config_mon.json
new file mode 100644
index 0000000..f099c74
--- /dev/null
+++ b/chef/roles/openstack_config_mon.json
@@ -0,0 +1,8 @@
+{
+  "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
new file mode 100644
index 0000000..e75ab92
--- /dev/null
+++ b/chef/roles/openstack_config_radosgw.json
@@ -0,0 +1,8 @@
+{
+  "name": "openstack_config_radosgw",
+  "description": "openstack_config_radosgw",
+  "run_list": [
+    "recipe[ceph::repo]",
+    "recipe[ceph::openstack_config_radosgw]"
+  ]
+}
diff --git a/chef/roles/os-compute-controller.json b/chef/roles/os-compute-controller.json
index 6392768..f9edbc1 100644
--- a/chef/roles/os-compute-controller.json
+++ b/chef/roles/os-compute-controller.json
@@ -14,7 +14,8 @@
     "role[os-compute-scheduler]",
     "role[os-compute-api]",
     "role[os-compute-cert]",
-    "role[os-compute-vncproxy]"
+    "role[os-compute-vncproxy]",
+    "role[os-compute-api-metadata]""
   ],
   "env_run_lists": {
   }
diff --git a/chef/roles/os-compute-worker.json b/chef/roles/os-compute-worker.json
index 1462c28..77f6406 100644
--- a/chef/roles/os-compute-worker.json
+++ b/chef/roles/os-compute-worker.json
@@ -16,7 +16,8 @@
   "chef_type": "role",
   "run_list": [
     "role[os-base]",
-    "recipe[openstack-compute::compute]"
+    "recipe[openstack-compute::compute]",
+    "recipe[openssh::passwordless]"
   ],
   "env_run_lists": {
   }