Permalink
Browse files

new euca_conf, eucadmin, and registration updates

  • Loading branch information...
2 parents 959ebee + 968b0c7 commit c404000fd27cf45b2ef9e47f3c3f623c2e5b1a07 root committed Apr 20, 2011
Showing with 4,397 additions and 6,076 deletions.
  1. +1 −0 Makedefs.in
  2. +1 −1 clc/.classpath
  3. +1 −1 clc/.project
  4. +19 −0 clc/.settings/grze_localhost.launch
  5. +20 −0 clc/.settings/grze_office.launch
  6. +9 −0 clc/Makefile
  7. +2 −1 clc/build.xml
  8. +41 −0 clc/eucadmin/Makefile
  9. +164 −48 clc/eucadmin/bin/{euca_conf → euca_conf.in}
  10. +0 −82 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/__init__.py
  11. +0 −206 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/clusters.py
  12. +0 −82 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/command.py
  13. +0 −246 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/components.py
  14. +0 −72 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/generic.py
  15. +0 −121 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/groups.py
  16. +0 −74 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/heartbeat.py
  17. +0 −108 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/hypervregister.py
  18. +0 −177 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/properties.py
  19. +0 −198 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/storagecontrollers.py
  20. +0 −139 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/synckeys.py
  21. +0 −173 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/users.py
  22. +0 −190 clc/eucadmin/build/lib.linux-x86_64-2.6/eucadmin/walruses.py
  23. +0 −11 clc/eucadmin/build/scripts-2.6/euca-add-user
  24. +0 −11 clc/eucadmin/build/scripts-2.6/euca-add-user-group
  25. +0 −11 clc/eucadmin/build/scripts-2.6/euca-delete-user
  26. +0 −11 clc/eucadmin/build/scripts-2.6/euca-delete-user-group
  27. +0 −11 clc/eucadmin/build/scripts-2.6/euca-deregister-cluster
  28. +0 −11 clc/eucadmin/build/scripts-2.6/euca-deregister-storage-controller
  29. +0 −11 clc/eucadmin/build/scripts-2.6/euca-deregister-walrus
  30. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-clusters
  31. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-components
  32. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-properties
  33. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-services
  34. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-storage-controllers
  35. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-user-groups
  36. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-users
  37. +0 −11 clc/eucadmin/build/scripts-2.6/euca-describe-walruses
  38. +0 −21 clc/eucadmin/build/scripts-2.6/euca-get-credentials
  39. +0 −11 clc/eucadmin/build/scripts-2.6/euca-modify-cluster
  40. +0 −12 clc/eucadmin/build/scripts-2.6/euca-modify-property
  41. +0 −11 clc/eucadmin/build/scripts-2.6/euca-modify-storage-controller
  42. +0 −11 clc/eucadmin/build/scripts-2.6/euca-modify-walrus
  43. +0 −11 clc/eucadmin/build/scripts-2.6/euca-register-cluster
  44. +0 −11 clc/eucadmin/build/scripts-2.6/euca-register-storage-controller
  45. +0 −11 clc/eucadmin/build/scripts-2.6/euca-register-walrus
  46. +0 −160 clc/eucadmin/build/scripts-2.6/euca_conf
  47. +1 −1 clc/eucadmin/eucadmin/enable.py
  48. +2 −1 clc/eucadmin/eucadmin/eucasetup.py
  49. +21 −11 clc/eucadmin/eucadmin/getcredentials.py
  50. +26 −2 clc/eucadmin/eucadmin/modifypropertyvalue.py
  51. +8 −8 clc/eucadmin/eucadmin/registerstoragecontroller.py
  52. +8 −8 clc/eucadmin/eucadmin/registervmwarebroker.py
  53. +8 −8 clc/eucadmin/eucadmin/registerwalrus.py
  54. +3 −3 clc/eucadmin/eucadmin/synckeys.py
  55. +2 −0 clc/eucadmin/setup.cfg.in
  56. +2 −10 clc/eucadmin/setup.py
  57. +55 −0 clc/modules/bootstrap/src/main/native/arguments.ggo
  58. +8 −129 clc/modules/bootstrap/src/main/native/arguments.ggo.in
  59. +7 −15 clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.c
  60. +81 −107 clc/modules/bootstrap/src/main/native/eucalyptus-opts.c
  61. +11 −14 clc/modules/bootstrap/src/main/native/eucalyptus-opts.h
  62. +0 −4 clc/modules/cloud/src/main/resources/eucalyptus-model.xml
  63. +1 −1 clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/DynamicSystemAddressManager.java
  64. +1 −1 clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/StaticSystemAddressManager.java
  65. +24 −25 clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Snapshot.java
  66. +16 −16 clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotManager.java
  67. +56 −58 clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/StorageUtil.java
  68. +20 −13 clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volume.java
  69. +42 −36 clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/VolumeManager.java
  70. +2 −2 clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/WalrusUtil.java
  71. +38 −29 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Cluster.java
  72. +18 −14 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBuilder.java
  73. +214 −129 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterEndpoint.java
  74. +20 −11 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmInstance.java
  75. +8 −6 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmInstances.java
  76. +10 −6 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/NetworkStateCallback.java
  77. +21 −0 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ServiceStateCallback.java
  78. +1 −1 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmPendingCallback.java
  79. +4 −2 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeAttachCallback.java
  80. 0 clc/modules/{cloud → cluster-manager}/src/main/java/com/eucalyptus/keys/KeyPairManager.java
  81. 0 clc/modules/{cloud → cluster-manager}/src/main/java/com/eucalyptus/keys/KeyPairUtil.java
  82. 0 clc/modules/{cloud → cluster-manager}/src/main/java/com/eucalyptus/keys/SshKeyPair.java
  83. +2 −2 clc/modules/cluster-manager/src/main/java/com/eucalyptus/util/async/StatefulMessageSet.java
  84. +1 −1 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/SystemState.java
  85. +9 −9 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java
  86. +3 −3 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmMetadata.java
  87. +1 −1 clc/modules/component/src/main/java/com/eucalyptus/cloud/ws/ComponentService.java
  88. +19 −5 clc/modules/configuration/src/main/java/com/eucalyptus/config/Configuration.java
  89. +3 −3 clc/modules/core/src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java
  90. +4 −4 clc/modules/core/src/main/java/com/eucalyptus/util/StorageProperties.java
  91. +1 −1 clc/modules/core/src/main/java/com/eucalyptus/util/WalrusProperties.java
  92. +1 −1 clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java
  93. +0 −4 clc/modules/core/src/main/resources/log4j.xml
  94. +3 −3 clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestHarness.java
  95. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacCredentials.java
  96. +20 −57 clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrap.java
  97. +28 −24 clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrapper.java
  98. +3 −3 clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/HostManager.java
  99. +2 −2 clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/HostStateMonitor.java
  100. +21 −20 clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java
  101. +1 −3 clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemIds.java
  102. +315 −0 clc/modules/msgs/src/main/java/com/eucalyptus/component/BasicService.java
  103. +256 −507 clc/modules/msgs/src/main/java/com/eucalyptus/component/Component.java
  104. +2 −4 clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentDiscovery.java
  105. +6 −2 clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
  106. +22 −3 clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentIds.java
  107. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java
  108. +122 −148 clc/modules/msgs/src/main/java/com/eucalyptus/component/Components.java
  109. +24 −9 clc/modules/msgs/src/main/java/com/eucalyptus/component/DummyServiceBuilder.java
  110. +161 −0 clc/modules/msgs/src/main/java/com/eucalyptus/component/EphemeralConfiguration.groovy
  111. +9 −8 clc/modules/msgs/src/main/java/com/eucalyptus/component/Host.java
  112. +2 −2 clc/modules/msgs/src/main/java/com/eucalyptus/component/Hosts.java
  113. +249 −0 clc/modules/msgs/src/main/java/com/eucalyptus/component/MessagableService.java
  114. +249 −0 clc/modules/msgs/src/main/java/com/eucalyptus/component/MissingService.java
  115. +9 −8 ...om/eucalyptus/config → msgs/src/main/java/com/eucalyptus/component}/NoSuchComponentException.java
  116. +23 −0 clc/modules/msgs/src/main/java/com/eucalyptus/component/NoSuchServiceException.java
  117. +11 −1 clc/modules/msgs/src/main/java/com/eucalyptus/component/Partitions.java
  118. +41 −145 clc/modules/msgs/src/main/java/com/eucalyptus/component/Service.java
  119. +5 −1 clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilderRegistry.java
  120. +8 −3 clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfiguration.java
  121. +6 −98 clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfigurations.java
  122. +8 −12 clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceEndpoint.java
  123. +26 −186 clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceState.java
  124. +468 −0 clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceTransitions.java
  125. +76 −0 clc/modules/msgs/src/main/java/com/eucalyptus/component/Services.java
  126. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/component/auth/SystemCredentialProvider.java
  127. +13 −15 clc/modules/msgs/src/main/java/com/eucalyptus/component/id/ClusterController.java
  128. +2 −1 clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Database.java
  129. +6 −0 clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Dns.java
  130. +118 −0 clc/modules/msgs/src/main/java/com/eucalyptus/component/id/GatherLogService.java
  131. +6 −1 clc/modules/msgs/src/main/java/com/eucalyptus/component/id/NodeController.java
  132. +20 −2 clc/modules/msgs/src/main/java/com/eucalyptus/config/ComponentConfiguration.java
  133. +4 −0 clc/modules/msgs/src/main/java/com/eucalyptus/context/Contexts.java
  134. +22 −12 clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextManager.java
  135. +13 −13 clc/modules/msgs/src/main/java/com/eucalyptus/entities/EntityWrapper.java
  136. +3 −3 clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceErrorFilter.java
  137. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/entities/TxHandle.java
  138. +7 −4 clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpRequest.java
  139. +2 −1 clc/modules/msgs/src/main/java/com/eucalyptus/records/EventType.java
  140. +3 −3 clc/modules/msgs/src/main/java/com/eucalyptus/records/LogFileRecord.java
  141. +2 −1 clc/modules/msgs/src/main/java/com/eucalyptus/system/EucaLayout.java
  142. +0 −9 clc/modules/msgs/src/main/java/com/eucalyptus/system/LogLevels.java
  143. +0 −20 clc/modules/msgs/src/main/java/com/eucalyptus/util/ExceptionUtil.java
  144. +1 −2 clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java
  145. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/util/Internets.java
  146. +13 −0 clc/modules/msgs/src/main/java/com/eucalyptus/util/Logs.java
  147. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/util/Mbeans.java
  148. +16 −9 clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequest.java
  149. +20 −19 clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequestHandler.java
  150. +9 −1 clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Futures.java
  151. +4 −3 clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Request.java
  152. +2 −1 clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestHandler.java
  153. +122 −0 clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AbstractTransitionAction.java
  154. +135 −102 clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AtomicMarkedState.java
  155. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/FusedCallbackTransition.java
  156. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/SplitTransition.java
  157. +86 −0 clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachine.java
  158. +116 −21 clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachineBuilder.java
  159. +58 −39 clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionAction.java
  160. +16 −11 clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/{Transition.java → TransitionImpl.java}
  161. +0 −85 clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/Transitions.java
  162. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/ws/EmpyreanService.java
  163. +2 −10 clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/ServiceDispatcher.java
  164. +2 −2 clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/BindingHandler.java
  165. +0 −319 clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/HeartbeatHandler.java
  166. +3 −3 clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/MessageStackHandler.java
  167. +2 −2 clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/RestfulMarshallingHandler.java
  168. +2 −2 clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/FilteredPipeline.java
  169. +25 −36 ...ules/msgs/src/main/java/com/eucalyptus/ws/server/{HeartbeatPipeline.java → LegacyHBPipeline.java}
  170. +4 −4 clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceContextHandler.java
  171. +3 −3 clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceSinkHandler.java
  172. +3 −3 clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/PipelineRegistry.java
  173. +2 −2 clc/modules/reporting/src/main/java/com/eucalyptus/reporting/queue/QueueBroker.java
  174. +0 −1 clc/modules/walrus/src/main/resources/walrus-model.xml
  175. +29 −32 clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceDispatchBootstrapper.java
  176. +0 −83 clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceVerifyBootstrapper.java
  177. +0 −98 clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/HeartbeatClient.java
  178. +0 −285 clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/RemoteBootstrapperClient.java
  179. +3 −3 clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/NioServerHandler.java
  180. +0 −300 clc/modules/wsstack/src/main/java/com/eucalyptus/ws/server/RemoteBootstrapperServer.java
  181. +4 −5 clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java
  182. +1 −1 clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/RemoteInfoHandler.java
  183. +10 −4 clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/X509Download.java
  184. +242 −191 configure
  185. +13 −1 configure.ac
  186. +2 −2 tools/Makefile
View
@@ -47,6 +47,7 @@ ANT = @ANT@ -e
WSDL2C = @WSDL2C@
JAVA_HOME = @JAVA_HOME@
RM = @RM@
+PYTHON_BIN = @PYTHON_BIN@
# compile time configurations
euca_theme = @INTERFACE_THEME@
View
@@ -100,7 +100,7 @@
<classpathentry kind="lib" path="lib/geronimo-stax-1.0-spec-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/groovy-all-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/guava-r08-gwt.jar"/>
- <classpathentry kind="lib" path="lib/guava-r08.jar"/>
+ <classpathentry kind="lib" path="lib/guava-r08.jar" sourcepath="/bzr/third-party/guava-libraries-read-only"/>
<classpathentry kind="lib" path="lib/gwt-api-checker-2.0.jar"/>
<classpathentry kind="lib" path="lib/gwt-dev-2.0.jar"/>
<classpathentry kind="lib" path="lib/gwt-servlet-2.0.jar"/>
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>eee:clc</name>
+ <name>grze_eee:clc</name>
<comment></comment>
<projects>
</projects>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/grze_eee::clc"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="false"/>
+<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
+<mapEntry key="hostname" value="localhost"/>
+<mapEntry key="port" value="5005"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="grze_eee:clc"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>
+</launchConfiguration>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">
+<stringAttribute key="bad_container_name" value="/bzr:grze_eee:clc/grze.debug"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/grze_eee::clc"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="false"/>
+<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
+<mapEntry key="hostname" value="10.1.1.10"/>
+<mapEntry key="port" value="5005"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="grze_eee:clc"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>
+</launchConfiguration>
View
@@ -56,6 +56,7 @@ build: deps extras
@make -C modules/storage-controller/native
@make -C modules/storage-san/native
@make -C modules/bootstrap/src/main/native
+ @make -C eucadmin
build-test: deps extras
@# we need JAVA_HOME
@@ -71,6 +72,7 @@ build-test: deps extras
@make -C modules/storage-controller/native
@make -C modules/storage-san/native
@make -C modules/bootstrap/src/main/native
+ @make -C eucadmin
build-test: deps extras
@# we need JAVA_HOME
@@ -85,35 +87,41 @@ build-test: deps extras
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) jar
@make -C modules/storage-controller/native
@make -C modules/bootstrap/src/main/native
+ @make -C eucadmin
clean:
$(ANT) clean
make -C modules/bootstrap/src/main/native clean
make -C modules/storage-controller/native clean
make -C modules/storage-san/native clean
+ make -C eucadmin clean
distclean: clean
$(ANT) distclean
make -C modules/bootstrap/src/main/native distclean
make -C modules/storage-controller/native distclean
make -C modules/storage-san/native distclean
+ make -C eucadmin distclean
install-test: build-test
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) install
@make -C modules/storage-controller/native install
@make -C modules/bootstrap/src/main/native install
+ @make -C eucadmin install
install: build
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) install
@make -C modules/storage-controller/native install
@make -C modules/storage-san/native install
@make -C modules/bootstrap/src/main/native install
+ @make -C eucadmin install
install-test: build-test
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m" $(ANT) install
@make -C modules/storage-controller/native install
@make -C modules/storage-san/native install
@make -C modules/bootstrap/src/main/native install
+ @make -C eucadmin install
deploy: install
@@ -122,6 +130,7 @@ uninstall:
make -C modules/storage-controller/native uninstall
make -C modules/storage-san/native uninstall
make -C modules/bootstrap/src/main/native uninstall
+ make -C eucadmin uninstall
$(RM) -rf $(DESTDIR)$(etcdir)/eucalyptus/cloud.d
$(RM) -rf $(DESTDIR)$(datarootdir)/eucalyptus/*jar
$(RM) -rf $(DESTDIR)$(vardir)/eucalyptus/webapps
View
@@ -286,13 +286,14 @@
<exclude name="**/gwt-user-*.jar" />
</fileset>
</copy>
- <!--copy admin tools -->
<mkdir dir="${DESTDIR}${euca.bin.dir}" />
+ <!--copy admin tools
<copy todir="${DESTDIR}${euca.bin.dir}" overwrite="true">
<fileset dir="${tools.dir}">
<include name="**/*" />
</fileset>
</copy>
+ -->
<chmod dir="${DESTDIR}${euca.bin.dir}" perm="0755">
<include name="**/euca-*" />
</chmod>
View
@@ -0,0 +1,41 @@
+###############################################################################
+# Copyright (c) 2009 Eucalyptus Systems, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, only version 3 of the License.
+#
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Please contact Eucalyptus Systems, Inc., 130 Castilian
+# Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+# if you need additional information or have any questions.
+#
+###############################################################################
+# Author: Chris Grzegorczyk grze@eucalyptus.com
+###############################################################################
+include ../../Makedefs
+
+all: euca_admin
+build: euca_admin
+
+euca_admin:
+ $(PYTHON_BIN) setup.py build
+
+install: euca_admin
+ $(PYTHON_BIN) setup.py install
+
+clean:
+ @$(RM) -fr ./dist
+
+distclean: clean
+
+uninstall:
+ @echo uninstall
Oops, something went wrong.

0 comments on commit c404000

Please sign in to comment.