Ian Southam
7d0df32560
Lots of fixes from the testing
...
firewallrules implemented sperately from networkacl (ugly but best that can be done ATM)
Some refactoring in CsDHCP as it made no sense to do it that way anymore
processmonitoring implemented
Domain not correctly sourced in VR
2015-03-16 11:38:15 +01:00
Ian Southam
0496ba7a00
firewallrules (VR) and metworkacl (VPC) did not as I believe they shgould get combined
...
in the underlying java code
Have split them out again.
Omce tested this will need some refactorinfg because it is currently PFU
2015-03-16 11:38:15 +01:00
Hugo Trippaers
5c4d221c34
Let's stick to CamelCase for now
2015-03-16 11:38:12 +01:00
Hugo Trippaers
a2e7f30542
Fix license headers
2015-03-16 11:38:08 +01:00
Hugo Trippaers
9385f071d7
Fix PEP8 compliance
2015-03-16 11:38:07 +01:00
Hugo Trippaers
0afe0153a7
Fix tab characters
2015-03-16 11:38:06 +01:00
Ian Southam
2f8352bf96
Daft mistake that left more data getting merged than we would have liked
2015-03-16 11:38:06 +01:00
Hugo Trippaers
01acd3d8ec
VR interfaces need the proper network type in ips
2015-03-16 11:38:05 +01:00
Ian Southam
b95d8257a4
Merge operation for site2site vpn
2015-03-16 11:35:28 +01:00
Hugo Trippaers
8c5dba31d0
Fix the forwardingrule databag
2015-03-16 11:35:24 +01:00
Hugo Trippaers
f273fd4659
Add the static nat rules to the merge procedure
2015-03-16 11:35:23 +01:00
Ian Southam
b45c71ee31
Acl code linked in
...
Dhcp code
Test file for dhcp entry
2015-03-16 11:35:22 +01:00
Hugo Trippaers
e323d63867
Merge vmmetadata, reuse the code from the existing script to parse it.
2015-03-16 11:35:20 +01:00
Ian Southam
3ea63ced68
Added merge for network_acl type message
2015-03-16 11:35:19 +01:00
Ian Southam
fff3964332
Add catchall for unknown types
2015-03-16 11:35:19 +01:00
Ian Southam
680454dfdf
Some bug fixes
...
Some more tests
store vmpassword functionally working
Tests for store password
2015-03-16 11:35:18 +01:00
Ian Southam
4c5f4a1f9f
Added vmpassword type (does nothing yet)
...
Fixed tests to use /var/cache/cloud
Added some test files but will remove them when tests are properly completed
Fixed a bug in configure that did not deal well with databags with empty dev sections
2015-03-16 11:35:17 +01:00
Hugo Trippaers
6a016d5b54
Small fixes
2015-03-16 11:35:17 +01:00
Hugo Trippaers
58919dcf50
Change the location for the temporary json files to /var/cache/cloud
2015-03-16 11:35:16 +01:00
Ian Southam
05702ecd1a
Added guest network configuration
...
Added iptables config (adds but no deletes yet)
Apache config (VPC GN)
DNSMasq config (VPX GN)
2015-03-16 11:35:10 +01:00
Ian Southam
666dc16e58
Moved bag location to /et/cloudstack
...
Updated test script to also process command line
Added connmark stuff to merge
2015-03-16 11:35:09 +01:00
Ian Southam
c7c1f3202e
Plan B
...
Replace chef with a python script
configure.py will read the bags and (hopefully) create the desired state
At this stage this is ipassociation
This code should work for both VR and VPCrs
TODO:
iptables
ip route throw (present in VR but not in VPCr
Determine default route
Unit tests
2015-03-16 11:35:08 +01:00
Ian Southam
3811b8dc90
Split Databag in to separate class as I would now need this
2015-03-16 11:35:06 +01:00
Ian Southam
3077eb925b
Include the guestnetwork code
...
This takes the guestnetwork object and also creates an ip object
2015-03-16 11:35:06 +01:00
Ian Southam
9355dd7133
Corrected a hole in my logic
2015-03-16 11:35:05 +01:00
Ian Southam
0bf7d54722
1. Completed provider for ip rules (fwmark)
...
2. Added merge routine for guestnetwork config messages
3. Updated test script
2015-03-16 11:35:05 +01:00
Hugo Trippaers
0027db6cd1
Switch ip associations to new model and update the recipes
2015-03-16 11:35:04 +01:00
Ian Southam
bcb760e1e2
Can now read the ips out of the cmdline databag (if present)
2015-03-16 11:35:03 +01:00
Ian Southam
018b56385c
Added cs_ip module
...
Corrected syntax error in merge.py
2015-03-16 11:35:02 +01:00
Ian Southam
a357e12943
Add the Python bits
2015-03-16 11:35:02 +01:00
