Merge roles from OpenDeployment repo

Change-Id: I072f946924e74fc92f98c98b344263f3873930ba
This commit is contained in:
Weidong Shao 2014-09-03 05:41:03 +00:00
parent 305f84685d
commit c1e8a92d53
7 changed files with 49 additions and 3 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*.swp
*~

View File

@ -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]"

View File

@ -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": {
}

View File

@ -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": {
}
}

View File

@ -8,7 +8,6 @@
},
"chef_type": "role",
"run_list": [
"recipe[memcached]",
"role[os-base]",
"recipe[openstack-dashboard::server]"
],

25
chef/roles/os-ha.json Normal file
View File

@ -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": {
}
}

View File

@ -9,6 +9,7 @@
"chef_type": "role",
"run_list": [
"role[os-base]",
"role[os-ops-caching]",
"recipe[openstack-identity::server]",
"recipe[openstack-identity::registration]"
],