From c1e8a92d53030bd495071545a4d832551a0d98fe Mon Sep 17 00:00:00 2001
From: Weidong Shao <weidong.shao@huawei.com>
Date: Wed, 3 Sep 2014 05:41:03 +0000
Subject: [PATCH] Merge roles from OpenDeployment repo

Change-Id: I072f946924e74fc92f98c98b344263f3873930ba
---
 .gitignore                        |  2 ++
 chef/roles/os-compute-api.json    |  1 -
 chef/roles/os-compute-worker.json |  3 ++-
 chef/roles/os-controller.json     | 19 +++++++++++++++++++
 chef/roles/os-dashboard.json      |  1 -
 chef/roles/os-ha.json             | 25 +++++++++++++++++++++++++
 chef/roles/os-identity.json       |  1 +
 7 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 chef/roles/os-controller.json
 create mode 100644 chef/roles/os-ha.json

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d38c149
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+*~
diff --git a/chef/roles/os-compute-api.json b/chef/roles/os-compute-api.json
index 8d04ced..d261566 100644
--- a/chef/roles/os-compute-api.json
+++ b/chef/roles/os-compute-api.json
@@ -9,7 +9,6 @@
   "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]"
diff --git a/chef/roles/os-compute-worker.json b/chef/roles/os-compute-worker.json
index bb6aab6..294d85a 100644
--- a/chef/roles/os-compute-worker.json
+++ b/chef/roles/os-compute-worker.json
@@ -9,7 +9,8 @@
   "chef_type": "role",
   "run_list": [
     "role[os-base]",
-    "recipe[openstack-compute::compute]"
+    "recipe[openstack-compute::compute]",
+    "recipe[openssh::passwordless]"
   ],
   "env_run_lists": {
   }
diff --git a/chef/roles/os-controller.json b/chef/roles/os-controller.json
new file mode 100644
index 0000000..9c2d8f1
--- /dev/null
+++ b/chef/roles/os-controller.json
@@ -0,0 +1,19 @@
+{
+  "name": "os-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-identity]",
+    "role[os-dashboard]",
+    "role[os-compute-controller]",
+    "role[os-network-server]",
+    "role[os-block-storage-controller]"
+  ],
+  "env_run_lists": {
+  }
+}
diff --git a/chef/roles/os-dashboard.json b/chef/roles/os-dashboard.json
index 70415e7..730314a 100644
--- a/chef/roles/os-dashboard.json
+++ b/chef/roles/os-dashboard.json
@@ -8,7 +8,6 @@
   },
   "chef_type": "role",
   "run_list": [
-    "recipe[memcached]",
     "role[os-base]",
     "recipe[openstack-dashboard::server]"
   ],
diff --git a/chef/roles/os-ha.json b/chef/roles/os-ha.json
new file mode 100644
index 0000000..74c03f6
--- /dev/null
+++ b/chef/roles/os-ha.json
@@ -0,0 +1,25 @@
+{
+  "name": "os-ha",
+  "description": "Software load banance for all of the OpenStack services.",
+  "json_class": "Chef::Role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+    "collectd": {
+      "rhel": {
+        "plugins": {
+          "processes": {
+            "Process": ["haproxy", "keepalived"]
+          }
+        }
+      }
+    }
+  },
+  "chef_type": "role",
+  "run_list": [
+    "recipe[keepalived]",
+    "recipe[haproxy::tcp_lb]"
+  ],
+  "env_run_lists": {
+  }
+}
diff --git a/chef/roles/os-identity.json b/chef/roles/os-identity.json
index a494ded..0cac884 100644
--- a/chef/roles/os-identity.json
+++ b/chef/roles/os-identity.json
@@ -9,6 +9,7 @@
   "chef_type": "role",
   "run_list": [
     "role[os-base]",
+    "role[os-ops-caching]",
     "recipe[openstack-identity::server]",
     "recipe[openstack-identity::registration]"
   ],