7857b1f62a
CLOUDSTACK-573: check if external provider enabled, only when finalize the service/provider list for the network
2012-11-30 13:07:01 -08:00
4c86b1545d
CLOUDSTACK-424: Update userdata should propagate to VR
...
The code that would propage userdata to router, when updateVirtualMachine api
is called, was missing. As per the docs [0], userdata should be a base64 encoded
string upto 2KB which is put on domr's html directory adn using HTTP GET the
userdata information can be obtained from the domr.
The updateVirtualMachine api [0] would accept a base64 encoded string
and decoded and put into the domr's /var/www/html/userdata/<uservm ip>/user-data
file. The operation does not require the VM to be in stopped state, though it is
advised to stop and call this api in case the user vm has a script which gets
the userdata information from domr while starting.
For example, this script can be used to fetch the data:
server_ip=$(grep dhcp-server-identifier /var/lib/dhclient-eth0.leases | tail -1 | awk '{print $NF}' | tr '\;' ' ')
wget http://${server_ip}/latest/user-data
This feature can be useful, for example to use into puppet facts [1], or to do
automation and horizontal scaling etc. based on userdata.
[0] http://incubator.apache.org/cloudstack/docs/api/apidocs-4.0.0/domain_admin/updateVirtualMachine.html
[1] http://geek.jasonhancock.com/2011/11/09/cloudstack-userdata-into-puppet-facts/
BUG-ID : CLOUDSTACK-424
Reviewed-by: Rohit Yadav <bhaisaab@apache.org>
Reported-by: Nick Wales
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-15 18:43:51 +05:30
214bbf3ebd
CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup
...
Conflicts:
api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
server/src/com/cloud/network/element/CiscoNexusVSMElement.java
server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/element/NetscalerElement.java
server/src/com/cloud/network/element/OvsElement.java
server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/storage/StorageManager.java
2012-10-17 17:26:19 -07:00
6fd7da8f56
Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton.
2012-09-11 17:03:11 -07:00
4b8fb79ef6
Fix the output of instance-id and vm-id to UUID
2012-09-10 18:02:34 -07:00
663e250334
Replace db-id by UUID for user VM's vm-id.
2012-09-10 18:01:08 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
e7a1862867
VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -07:00
190329286c
VPC:
...
1) CS-15692 - ipAddress is always null for NetworkACL rule
2) CS-15699 - redundant router = true when provider is VirtualRouter
3) CS-15701 - fixed error message
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-27 13:55:39 -07:00
119e4e7443
VPC: CS-15681 - execute VPC related methods only when router is a vpc router
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-24 16:12:13 -07:00
1920c2a735
CS-15534: Mark VPN connection as Disconnected when rebootRouter
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-23 21:14:49 -07:00
df9315ff02
CS-15447: Don't enable s2s vpn when provider is disabled
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManager.java
2012-07-23 14:37:40 -07:00
5a64d4fbb1
VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
281b23c2cd
Fixed license headers
2012-07-18 14:52:13 -07:00
a6086dc806
Removed @author tag from bunch of resources
2012-07-06 17:25:36 -07:00
c9eb0c59bf
VPC: allow adding private gateway to the VPC when the VR is in Stopped state
2012-07-06 15:28:07 -07:00
540ea34f57
VPC: removed NetworkACL interface; added getTrafficType() to Firewall
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-06 11:08:00 -07:00
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
2b799aa9ac
VPC: added missing FirewallService to the VR provider
2012-07-03 17:22:41 -07:00
5d5b584a8e
VPC: remove network ACLs from VPC VR when shutdown guest network
2012-07-02 17:44:54 -07:00
40a3482f13
VPC: multiple fixes:
...
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
2012-07-02 17:44:54 -07:00
1d97af3abf
CS-6840: Add status checking for site 2 site VPN
2012-07-02 16:29:23 -07:00
8d4079d477
CS-6840: Add hypervisor commands for site-to-site vpn
...
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2012-07-02 16:28:44 -07:00
0ce1e78364
CS-6840: Add Site2SiteVpnServiceProvider
2012-07-02 16:27:09 -07:00
9876d34ea4
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
2012-07-02 15:05:58 -07:00
e87558256c
Patch from Chip Childers
...
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
634cd78baa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
client/tomcatconf/commands.properties.in
scripts/network/domr/getDomRVersion.sh
scripts/network/domr/ipassoc.sh
scripts/network/domr/l2tp_vpn.sh
scripts/network/domr/networkUsage.sh
scripts/network/domr/router_proxy.sh
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
setup/apidoc/gen_toc.py
setup/db/create-schema.sql
wscript
2012-06-28 17:41:40 -07:00
c41094154d
moving out OVS code to plugins/network-elements/ovs
2012-06-28 17:23:41 -07:00
a78fcedb5e
VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands
...
Conflicts:
server/src/com/cloud/network/element/NetscalerElement.java
2012-06-28 10:13:19 -07:00
1a232171eb
VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done
2012-06-28 10:11:41 -07:00
8197f1f07c
moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware
2012-06-26 19:48:55 -07:00
ce876e24de
VPC: intermidiate checkin to Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-06-25 21:00:57 -07:00
4e7b65ef71
VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter
2012-06-25 20:57:37 -07:00
030458a37b
VPC: implemented add/delete Private gateway
...
Conflicts:
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/dc/DataCenterVO.java
server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-25 20:54:14 -07:00
392ae5cb13
moving out Srx code into Plugins/network-elements
2012-06-25 16:55:53 -07:00
422c4ce513
moving out F5 code from server into plugins/network-elements/f5/
2012-06-23 14:16:59 -07:00
49b88472a5
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler
2012-06-21 18:57:18 -07:00
ccec9192a2
VPC: implemented delete and list Network ACL(s)
2012-06-20 17:20:04 -07:00
374a600746
VPC: initial checkin for network ACLs
...
Conflicts:
client/tomcatconf/commands.properties.in
2012-06-20 17:19:49 -07:00
7fda6306b8
VPC: fixed user vm start in case when Implemented network existed w/o VR (it was expunged with DestroyRouter command)
2012-06-20 17:19:17 -07:00
19f648f1aa
VPC: plug guest nic on guest network implement, and unplug on shutdown
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-19 10:09:46 -07:00
b3985a3b48
Added new capabilities to VPN and Firewall services defining if VPN is S2S or Remote access, and if the Firewall rules should be created per cidr or per public ip address
2012-06-15 14:33:06 -07:00
3e5f391c85
VPC: more changes to ipAssoc
2012-06-15 14:32:39 -07:00
982562b9fb
VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip)
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-15 14:31:58 -07:00
7e119e4c94
Fixed addDhcpEntry/userdata/password in VPC setup
2012-06-15 14:27:24 -07:00
aa84256542
1) Added VpcVirtualNetworkApplianceService interface
...
2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one
2012-06-15 14:27:00 -07:00
72974831a0
Modified virtual router startup procedure - initial start happens with control nic only; then we plug Public and then Guest nic to it
2012-06-15 14:22:19 -07:00
0a7faa9838
Support for adding private network
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-15 14:20:34 -07:00
Alena Prokharchyk
Rohit Yadav
Fang Wang
Sheng Yang
Murali reddy
David Nalley