Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

End of Sprint Merge #325

Merged
merged 54 commits into from

4 participants

@galstrom21

No description provided.

rcbjenkins and others added some commits
@rcbjenkins rcbjenkins Auto Updating hardware submodule e1f61f6
@rcbjenkins rcbjenkins Auto Updating collectd-plugins submodule b41f344
@rcbjenkins rcbjenkins Auto Updating collectd-graphite submodule 6234c97
@rcbjenkins rcbjenkins Auto Updating monit submodule e30d611
@rcbjenkins rcbjenkins Auto Updating osops-utils submodule 57e080d
@rcbjenkins rcbjenkins Auto Updating keepalived submodule f214e1e
@rcbjenkins rcbjenkins Auto Updating haproxy submodule 809729b
@rcbjenkins rcbjenkins Auto Updating monitoring submodule dd5cbb5
@rcbjenkins rcbjenkins Auto Updating sysctl submodule 2b53a1d
@rcbjenkins rcbjenkins Auto Updating swift submodule a081dc5
@rcbjenkins rcbjenkins Auto Updating nova-network submodule 139c132
@rcbjenkins rcbjenkins Auto Updating dsh submodule a6d6faa
@rcbjenkins rcbjenkins Auto Updating cinder submodule bb2d3db
@rcbjenkins rcbjenkins Auto Updating kong submodule 6b05136
@rcbjenkins rcbjenkins Auto Updating rabbitmq-openstack submodule 3b1c0f5
@rcbjenkins rcbjenkins Auto Updating keystone submodule 1894949
@rcbjenkins rcbjenkins Auto Updating collectd submodule 7da794f
@rcbjenkins rcbjenkins Auto Updating sosreport submodule 42afad9
@rcbjenkins rcbjenkins Auto Updating glance submodule f072cf4
@rcbjenkins rcbjenkins Auto Updating mysql-openstack submodule b31514b
@rcbjenkins rcbjenkins Auto Updating openstack-ha submodule b08eaaf
@rcbjenkins rcbjenkins Auto Updating horizon submodule 91b3929
@rcbjenkins rcbjenkins Auto Updating exerstack submodule e276a94
@rcbjenkins rcbjenkins Auto Updating rsyslog submodule 5cead1d
@rcbjenkins rcbjenkins Auto Updating graphite submodule c573cce
@rcbjenkins rcbjenkins Auto Updating nova submodule 6326e4a
@rcbjenkins rcbjenkins Auto Updating aws submodule f849fba
@rcbjenkins rcbjenkins Auto Updating keystone submodule ce3c25d
@rcbjenkins rcbjenkins Auto Updating mysql-openstack submodule 3c35f9e
@rcbjenkins rcbjenkins Auto Updating openssl submodule c387634
@rcbjenkins rcbjenkins Auto Updating mysql submodule d65d827
@rcbjenkins rcbjenkins Auto Updating database submodule 8edb4b0
@rcbjenkins rcbjenkins Auto Updating postgresql submodule 6c572bb
Arthur Maltson Put quotes around roles
I wasn't able to add these roles unless I put quotes around them.
bed6fe6
@mancdaz mancdaz Merge pull request #321 from amaltson/readme-update
Put quotes around roles
f138ffb
@rcbjenkins rcbjenkins Auto Updating apache2 submodule 219f603
@rcbjenkins rcbjenkins Auto Updating mysql submodule f7ce8f8
@rcbjenkins rcbjenkins Auto Updating osops-utils submodule ca70a95
@rcbjenkins rcbjenkins Auto Updating osops-utils submodule 6bd6e29
@rcbjenkins rcbjenkins Auto Updating glance submodule 46c4b23
@rcbjenkins rcbjenkins Auto Updating mysql submodule 3a95e77
@rcbjenkins rcbjenkins Auto Updating haproxy submodule 814b98e
@rcbjenkins rcbjenkins Auto Updating openstack-ha submodule d716ba0
@rcbjenkins rcbjenkins Auto Updating aws submodule 1e30df2
@rcbjenkins rcbjenkins Auto Updating apache2 submodule 4b8ac10
@rcbjenkins rcbjenkins Auto Updating nova submodule 43087fc
@rcbjenkins rcbjenkins Auto Updating nova submodule cb31e8a
@rcbjenkins rcbjenkins Auto Updating nova submodule 9b98755
@rcbjenkins rcbjenkins Auto Updating hardware submodule efb8179
@mancdaz mancdaz add memcached and runit submodules 14e314c
@mancdaz mancdaz Merge pull request #324 from mancdaz/sprint
add memcached and runit submodules
eb778c2
@rcbjenkins rcbjenkins Auto Updating swift submodule 4258b95
@rcbjenkins rcbjenkins Auto Updating cinder submodule 8bb46bf
@rcbjenkins rcbjenkins Auto Updating monitoring submodule 748bd6e
@breu

Merging

@breu breu merged commit 4ffc187 into master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 5, 2013
  1. @rcbjenkins
  2. @rcbjenkins
  3. @rcbjenkins
  4. @rcbjenkins
  5. @rcbjenkins
  6. @rcbjenkins
  7. @rcbjenkins
  8. @rcbjenkins
  9. @rcbjenkins
  10. @rcbjenkins
  11. @rcbjenkins
  12. @rcbjenkins
  13. @rcbjenkins
  14. @rcbjenkins
  15. @rcbjenkins
  16. @rcbjenkins
  17. @rcbjenkins
  18. @rcbjenkins
  19. @rcbjenkins
  20. @rcbjenkins
  21. @rcbjenkins
  22. @rcbjenkins
  23. @rcbjenkins
  24. @rcbjenkins
  25. @rcbjenkins
  26. @rcbjenkins
Commits on Mar 7, 2013
  1. @rcbjenkins
  2. @rcbjenkins
  3. @rcbjenkins
Commits on Mar 10, 2013
  1. @rcbjenkins
Commits on Mar 12, 2013
  1. @rcbjenkins
Commits on Mar 13, 2013
  1. @rcbjenkins
  2. @rcbjenkins
  3. Put quotes around roles

    Arthur Maltson authored
    I wasn't able to add these roles unless I put quotes around them.
  4. @mancdaz

    Merge pull request #321 from amaltson/readme-update

    mancdaz authored
    Put quotes around roles
Commits on Mar 14, 2013
  1. @rcbjenkins
  2. @rcbjenkins
  3. @rcbjenkins
  4. @rcbjenkins
  5. @rcbjenkins
Commits on Mar 15, 2013
  1. @rcbjenkins
  2. @rcbjenkins
  3. @rcbjenkins
Commits on Mar 16, 2013
  1. @rcbjenkins

    Auto Updating aws submodule

    rcbjenkins authored
Commits on Mar 17, 2013
  1. @rcbjenkins
Commits on Mar 19, 2013
  1. @rcbjenkins
  2. @rcbjenkins
  3. @rcbjenkins
  4. @rcbjenkins
Commits on Mar 20, 2013
  1. @mancdaz
  2. @mancdaz

    Merge pull request #324 from mancdaz/sprint

    mancdaz authored
    add memcached and runit submodules
  3. @rcbjenkins
  4. @rcbjenkins
  5. @rcbjenkins
This page is out of date. Refresh to see the latest.
Showing with 57 additions and 49 deletions.
  1. +6 −0 .gitmodules
  2. +17 −17 README.md
  3. +1 −1  cookbooks/apache2
  4. +1 −1  cookbooks/aws
  5. +1 −1  cookbooks/cinder
  6. +1 −1  cookbooks/collectd
  7. +1 −1  cookbooks/collectd-graphite
  8. +1 −1  cookbooks/collectd-plugins
  9. +1 −1  cookbooks/database
  10. +1 −1  cookbooks/dsh
  11. +1 −1  cookbooks/exerstack
  12. +1 −1  cookbooks/glance
  13. +1 −1  cookbooks/graphite
  14. +1 −1  cookbooks/haproxy
  15. +1 −1  cookbooks/hardware
  16. +1 −1  cookbooks/horizon
  17. +1 −1  cookbooks/keepalived
  18. +1 −1  cookbooks/keystone
  19. +1 −1  cookbooks/kong
  20. +1 −0  cookbooks/memcached
  21. +1 −1  cookbooks/monit
  22. +1 −1  cookbooks/monitoring
  23. +1 −1  cookbooks/mysql
  24. +1 −1  cookbooks/mysql-openstack
  25. +1 −1  cookbooks/nova
  26. +1 −1  cookbooks/nova-network
  27. +1 −1  cookbooks/openssl
  28. +1 −1  cookbooks/openstack-ha
  29. +1 −1  cookbooks/osops-utils
  30. +1 −1  cookbooks/postgresql
  31. +1 −1  cookbooks/rabbitmq-openstack
  32. +1 −1  cookbooks/rsyslog
  33. +1 −0  cookbooks/runit
  34. +1 −1  cookbooks/sosreport
  35. +1 −1  cookbooks/swift
  36. +1 −1  cookbooks/sysctl
View
6 .gitmodules
@@ -127,3 +127,9 @@
[submodule "cookbooks/openstack-ha"]
path = cookbooks/openstack-ha
url = https://github.com/rcbops-cookbooks/openstack-ha.git
+[submodule "cookbooks/memcached"]
+ path = cookbooks/memcached
+ url = https://github.com/opscode-cookbooks/memcached.git
+[submodule "cookbooks/runit"]
+ path = cookbooks/runit
+ url = https://github.com/opscode-cookbooks/runit.git
View
34 README.md
@@ -37,34 +37,34 @@ Ensure you have [registered](http://wiki.opscode.com/display/chef/Cookbook+Fast+
* for an all-in-one deployment of nova, using keystone and glance, on a node called node1:
-`knife node run_list add node1 role[allinone]`
+`knife node run_list add node1 'role[allinone]'`
* for a 2 node deployment of nova, installing all nova controller functions, keystone and glance on node1, and setting node2 up as a compute server:
-`knife node run_list add node1 role[single-controller]`
-`knife node run_list add node2 role[single-compute]`
+`knife node run_list add node1 'role[single-controller]'`
+`knife node run_list add node2 'role[single-compute]'`
* for a multi node deployment as above but with 'N' nova compute nodes
-`knife node run_list add node1 role[single-controller]`
-`knife node run_list add node2 role[single-compute]`
-`knife node run_list add node3 role[single-compute]`
+`knife node run_list add node1 'role[single-controller]'`
+`knife node run_list add node2 'role[single-compute]'`
+`knife node run_list add node3 'role[single-compute]'`
`...`
-`knife node run_list add node[n] role[single-compute]`
+`knife node run_list add node[n] 'role[single-compute]'`
* for a many node deployment with mysql and keystone on one node, nova core functions and horizon on another, glance on another, rabbitmq on another, and 'N' compute nodes:
-`knife node run_list add node1 role[keystone]`
-`knife node run_list add node1 role[mysql-master]`
-`knife node run_list add node2 role[nova-controller]`
-`knife node run_list add node2 role[horizon-server]`
-`knife node run_list add node3 role[glance-api]`
-`knife node run_list add node3 role[glance-registry]`
-`knife node run_list add node4 role[rabbitmq-server]`
-`knife node run_list add node5 role[single-compute]`
-`knife node run_list add node6 role[single-compute]`
+`knife node run_list add node1 'role[keystone]'`
+`knife node run_list add node1 'role[mysql-master]'`
+`knife node run_list add node2 'role[nova-controller]'`
+`knife node run_list add node2 'role[horizon-server]'`
+`knife node run_list add node3 'role[glance-api]'`
+`knife node run_list add node3 'role[glance-registry]'`
+`knife node run_list add node4 'role[rabbitmq-server]'`
+`knife node run_list add node5 'role[single-compute]'`
+`knife node run_list add node6 'role[single-compute]'`
`...`
-`knife node run_list add nodeN role[single-compute]`
+`knife node run_list add nodeN 'role[single-compute]'`
## Custom template banners ##
2  cookbooks/apache2
@@ -1 +1 @@
-Subproject commit b590a382a2385950c47172acd32456ab70bbf628
+Subproject commit 4ec83f21528344cb802915f76838e64891e47e61
2  cookbooks/aws
@@ -1 +1 @@
-Subproject commit e6028169f063f62c6e30e2b2b9bc48adbd8900e3
+Subproject commit ebe94d9910551eac9ecd5ac007857c49219b3ec8
2  cookbooks/cinder
@@ -1 +1 @@
-Subproject commit d05429a8f35cdf583745b930aae8f3539d9d24aa
+Subproject commit 9a7f349be4341935b6bf21849aa6d73a2513035f
2  cookbooks/collectd
@@ -1 +1 @@
-Subproject commit b48f94d8cfdc70243726fb589a4217b0f27b5a01
+Subproject commit c7c1d6ea3a58f3074fbfdc8729117a1702dee46a
2  cookbooks/collectd-graphite
@@ -1 +1 @@
-Subproject commit bfe06b5bff21e23221f5e67ecbdd1394db13da06
+Subproject commit 512130cf4903160a89bc05fd934dd42e6f7f2897
2  cookbooks/collectd-plugins
@@ -1 +1 @@
-Subproject commit 2666d07ae465528bc5619d25ddd89e27afe0c138
+Subproject commit 631f387e7ad9c6358a63fe9a19936e0657502bcb
2  cookbooks/database
@@ -1 +1 @@
-Subproject commit cc6b4d746841acf321ff69b3b5e8f120e00f1db6
+Subproject commit fce02addc3a70cc34333da0e100bb00287b0e64b
2  cookbooks/dsh
@@ -1 +1 @@
-Subproject commit c815176dfd529b7fb8b984d3b0220af26632dbf3
+Subproject commit 637219f2f67d513294c9557406571604707c9f07
2  cookbooks/exerstack
@@ -1 +1 @@
-Subproject commit f75f715a7e60aed7de3e5d821074bedb6d5212cb
+Subproject commit 57988ce0d7dbc9590221f07b08f2722c77a94e5e
2  cookbooks/glance
@@ -1 +1 @@
-Subproject commit d0b74e4813cc9fbe7ba9b4831c0a123b03e53537
+Subproject commit 2e116258f92c9510d250e32cdea5b5f10a012388
2  cookbooks/graphite
@@ -1 +1 @@
-Subproject commit 61e182a1294a2a667eb0488ed79dda0c49f3b67b
+Subproject commit aeaaa5e5c5cf2e45cbc1813f561d20fc61a0b036
2  cookbooks/haproxy
@@ -1 +1 @@
-Subproject commit 7877a724787759e91bfca7a683e16bf52244ef0a
+Subproject commit ec6a5791cbf598abc982384096b0a7162a1e821b
2  cookbooks/hardware
@@ -1 +1 @@
-Subproject commit feed6f798b171c7463ed01d95399a879a5f8073a
+Subproject commit ccbcc98199341ff34827ac43b9fdc6dc031adc1c
2  cookbooks/horizon
@@ -1 +1 @@
-Subproject commit f06f910e8d05a0d3c32b604315073bd925c6ec50
+Subproject commit a9a893ae416d86ae071b4cca1faf4deb4d5f602e
2  cookbooks/keepalived
@@ -1 +1 @@
-Subproject commit d083f5ca653b9e2abefdb3b6fb24b67894708443
+Subproject commit adb5400a5b294cb9d42fddf38b8bfb8767e702d1
2  cookbooks/keystone
@@ -1 +1 @@
-Subproject commit 038b8eb537bddee2a89f1f383d214339c61e7d78
+Subproject commit e398ab0e6649c340186d28a8791d497877548fb1
2  cookbooks/kong
@@ -1 +1 @@
-Subproject commit 265735b2583678cb3b4b0c4cef9d77cb4da5b98a
+Subproject commit 63b4393ab26d01f5ebf99a881a1e8e8dd2bed898
1  cookbooks/memcached
@@ -0,0 +1 @@
+Subproject commit 86e878b6fff3e24d60b84cfd38de43356be6bdac
2  cookbooks/monit
@@ -1 +1 @@
-Subproject commit f08eeffff0a7256d300a7455e7c228ae9866c6bb
+Subproject commit 90ce56cd2262912e501551869dea2da6d62cc165
2  cookbooks/monitoring
@@ -1 +1 @@
-Subproject commit 5c39d6412c0db504164537ff463373ac5ec98cba
+Subproject commit be9c2f318523b9ab654abcaa1070a2f8405e8f43
2  cookbooks/mysql
@@ -1 +1 @@
-Subproject commit b7b1388cb67c1466179e169614f1ca84ebc8f425
+Subproject commit 29bd72bbfd56d7bea1d31e139815d508a673cbf2
2  cookbooks/mysql-openstack
@@ -1 +1 @@
-Subproject commit 322f7ef8a8f2a00f4ad228c12ab48e3cd1c365dc
+Subproject commit 75b0b21be71f58441ea5dfecec97f06023d7696c
2  cookbooks/nova
@@ -1 +1 @@
-Subproject commit d4bb2c5443bd5476fd71989ab08bf912b5c20c19
+Subproject commit 66ef05ae2e9f244a48b0de2022c60215eb3c1259
2  cookbooks/nova-network
@@ -1 +1 @@
-Subproject commit 5e393e115a858f6cfed2f7ac4934602c5605bd50
+Subproject commit 5bf6b77c5099ac8317e0f4bc7de01f43cbbd514a
2  cookbooks/openssl
@@ -1 +1 @@
-Subproject commit 7f5b84a942f015191ade6badf65a49f1fe7b05b1
+Subproject commit ccf81e9b3fec9427ed2e6dd76f252dcf68370379
2  cookbooks/openstack-ha
@@ -1 +1 @@
-Subproject commit f01179b8113c244df897d02649029f9ce75bf56f
+Subproject commit 51bccc0dd5b086685016b4f2b5a5104087af2f1e
2  cookbooks/osops-utils
@@ -1 +1 @@
-Subproject commit a39346abbb5585ed409f914e3637e04a7f1775da
+Subproject commit 64551d041b152f00a292dcf4e1d3bdf77684e8c5
2  cookbooks/postgresql
@@ -1 +1 @@
-Subproject commit 605877049c1abf259b317a535fb8b2d3871872aa
+Subproject commit 1dfa582a9b844c3cbe6019a3ddb831af004dce52
2  cookbooks/rabbitmq-openstack
@@ -1 +1 @@
-Subproject commit 35f5ff4680c945d47d4a67f58a4a59ab1f308d0f
+Subproject commit ee81d69f38647a3a78dcd8f3ef8e7a85b71fc5c9
2  cookbooks/rsyslog
@@ -1 +1 @@
-Subproject commit 4411039a6d45fef8bfd144b5363a7e4500c77a10
+Subproject commit 84dad1fd589642968a03707b2cc893cf42b67532
1  cookbooks/runit
@@ -0,0 +1 @@
+Subproject commit 014733451f17151e51ec8c7867800061f343bd82
2  cookbooks/sosreport
@@ -1 +1 @@
-Subproject commit 4f28a7039f2163a85cec54acd33b4d15f89b93a2
+Subproject commit f5b516c82fef41385d62fbceec846fa8b7abdc93
2  cookbooks/swift
@@ -1 +1 @@
-Subproject commit 253cade64f3abe2968cbf0c75b74e98b1dc160ec
+Subproject commit 1acb1d4d2d7a883e75a26d0ca144494b83f957bf
2  cookbooks/sysctl
@@ -1 +1 @@
-Subproject commit 118d60fa85c8cd9a63c84e6fc3ef9e089aecbb84
+Subproject commit b87140ffd13ac7ebec557de5b666fd2476cbbcc4
Something went wrong with that request. Please try again.