4758 Commits

Author SHA1 Message Date
Vishvananda Ishaya
95e7571a59 Simple Network avoids vlans 2010-07-02 10:39:04 -05:00
Vishvananda Ishaya
f8a19693b5 clean a few merge errors from network 2010-07-02 10:38:15 -05:00
Vishvananda Ishaya
5e8337aec0 Merge patch 30001 2010-07-02 10:31:44 -05:00
Vishvananda Ishaya
7897135ec1 Merge patch 16002 2010-07-02 10:29:55 -05:00
Vishvananda Ishaya
2dc33d52d6 Merge patch 21001 2010-07-02 10:27:59 -05:00
Vishvananda Ishaya
b85c7f94d6 Merge patch 28001 2010-07-02 10:25:56 -05:00
Vishvananda Ishaya
626257d822 Merge branch 'describe'
Conflicts:
	nova/endpoint/cloud.py
2010-07-02 10:23:57 -05:00
Vishvananda Ishaya
0650b5dacb Merge branch 'vpnkey' 2010-07-02 10:22:22 -05:00
Vishvananda Ishaya
cc15e8a55f Merge branch 'extra_reference' 2010-07-01 17:55:41 -05:00
Vishvananda Ishaya
5a93cc008a Merge branch 'comment_fix' 2010-07-01 17:51:32 -05:00
Vishvananda Ishaya
48572fe220 Merge branch 'master' into fixrbac 2010-07-01 17:41:57 -05:00
Vishvananda Ishaya
d40990ecee Merge remote branch 'nova/master'
Conflicts:
	docs/getting.started.rst
2010-07-01 17:38:03 -05:00
Soren Hansen
f322f02728 Add curl as a dependency of nova-compute. 2010-07-01 13:14:08 +02:00
Soren Hansen
a6fa632d9e Merge with trunk. 2010-07-01 13:13:52 +02:00
Vishvananda Ishaya
ea9b913ccc getting started update 2010-06-30 15:07:52 -05:00
Vishvananda Ishaya
55def9c6b9 getting started update 2010-06-30 15:04:23 -05:00
Vishvananda Ishaya
183d86aae3 Remove _s errors from merge 2010-06-30 11:24:41 -05:00
Vishvananda Ishaya
a7a5212cbd fix typos in node from merge 2010-06-30 11:17:56 -05:00
Vishvananda Ishaya
e57b10fdfd remove spaces from default cert 2010-06-30 11:16:54 -05:00
Soren Hansen
3b916f690c Make sure get_assigned_vlans and BaseNetwork.hosts always return a dict, even if the key is currently empty in the KVS. 2010-06-30 16:47:12 +02:00
Soren Hansen
7ce77bfffc Add _s instance attribute to Instance class. It's referenced in a bunch of places, but is never set. This is unlikely to be the right fix (why have two attributes pointing to the same object?), but it seems to make ends meet. 2010-06-30 16:46:47 +02:00
Soren Hansen
00971feed3 Replace spaces in x509 cert subject with underscores. It ends up getting split(' ')'ed and passed to subprocess.Popen, so it needs to not have spaces in it, otherwise openssl gets very upset. 2010-06-30 16:46:26 +02:00
Soren Hansen
4bdc2f061c Expand somewhat on the short and long descriptions in debian/control. 2010-06-30 16:46:02 +02:00
Soren Hansen
05afafab71 Use separate configuration files for the different daemons. 2010-06-30 16:45:41 +02:00
Vishvananda Ishaya
10b8e5bdaa Removed trailing whitespace from header 2010-06-29 21:25:59 -05:00
Devin Carlen
5a1f5839b8 Updated licenses 2010-06-29 21:25:39 -05:00
Devin Carlen
18abcde86b Added flags to smoketests. General cleanup 2010-06-29 21:23:29 -05:00
Vishvananda Ishaya
9ef046e77e removed all references to keeper 2010-06-29 18:02:00 -05:00
Jesse Andrews
7559c5b9f2 Merge commit '56443020bcd20894c13eb73bd04a0a5eab4ba960'
Conflicts:
	docs/getting.started.rst
2010-06-29 16:59:07 -05:00
Vishvananda Ishaya
c41bcdf19c reformatting 2010-06-29 14:27:55 -07:00
Vishvananda Ishaya
1dac03ffc5 Vpn ips and ports use redis 2010-06-29 14:01:13 -07:00
Vishvananda Ishaya
3a90ce226f review reformat 2010-06-29 08:55:27 -07:00
Vishvananda Ishaya
6d612730c5 code review reformat 2010-06-29 08:46:10 -07:00
Vishvananda Ishaya
a013a80124 Merge remote branch 'angst/apply_api' into diekeeper 2010-06-28 22:47:02 -07:00
Todd Willey
c7f7e1bc41 We need to be able to look up Instance by Node (live migration). 2010-06-29 01:20:43 -04:00
Todd Willey
3972cf90c2 Get rid of RedisModel 2010-06-29 01:02:48 -04:00
Vishvananda Ishaya
c363f32391 formatting fixes and refactoring from code review 2010-06-28 20:31:06 -07:00
Vishvananda Ishaya
bbaa17c262 reformatting to fit within 80 characters 2010-06-28 19:52:06 -07:00
Vishvananda Ishaya
286c0a6b7a simplified handling of tempdir for Fakes 2010-06-28 16:01:09 -07:00
Vishvananda Ishaya
72ccc08d22 fix for multiple shelves for each volume node 2010-06-28 15:36:59 -07:00
Vishvananda Ishaya
e6f3a97bb4 add object class violation exception to fakeldap 2010-06-28 14:09:54 -07:00
Vishvananda Ishaya
11a818b6dd remove spaces from default cert 2010-06-28 14:09:01 -07:00
Vishvananda Ishaya
8d42324bf9 remove silly default from generate cert 2010-06-28 14:08:24 -07:00
Vishvananda Ishaya
daada4adb2 fix of fakeldap imports and exceptions 2010-06-28 14:00:56 -07:00
Vishvananda Ishaya
974ecad209 More Comments, cleanup, and reformatting 2010-06-27 23:47:04 -07:00
Vishvananda Ishaya
a0cb58ad4f Merge branch 'master' into fixrbac 2010-06-27 23:21:52 -07:00
Vishvananda Ishaya
4bb9e67582 users.py cleanup for exception handling and typo 2010-06-27 23:20:38 -07:00
Vishvananda Ishaya
973e45e62d Make fakeldap use redis 2010-06-27 23:19:14 -07:00
Vishvananda Ishaya
715d33de15 Merge branch 'fixrbac' into fakeldap 2010-06-27 22:56:47 -07:00
Todd Willey
fcab63e316 Refactor network.Vlan to be a BasicModel, since it touched Redis. 2010-06-27 00:43:03 -04:00