Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge tweak to setup.py and some of cluster service status

  • Loading branch information...
commit 29419a4f677ec2b79f240f114fe0f252a21d2535 2 parents e93c4d4 + a1c25d5
@grze grze authored
View
10 clc/eucadmin/eucadmin/registervmwarebroker.py
@@ -37,11 +37,12 @@ class RegisterVMwareBroker(AWSQueryRequest):
ServicePath = '/services/Configuration'
ServiceClass = eucadmin.EucAdmin
Description = 'Register VMware broker'
- Params = [Param(name='Partition',
+ Params = [
+ Param(name='Partition',
short_name='P',
long_name='partition',
ptype='string',
- optional=True,
+ optional=False,
doc='Partition for the VMware broker'),
Param(name='Host',
short_name='H',
@@ -54,8 +55,9 @@ class RegisterVMwareBroker(AWSQueryRequest):
long_name='port',
ptype='integer',
default=8773,
- optional=False,
- doc='Port for the VMware broker')]
+ optional=True,
+ doc='Port for the VMware broker')
+ ]
Args = [Param(name='Name',
long_name='name',
ptype='string',
View
3  clc/eucadmin/setup.cfg.in
@@ -1,2 +1,3 @@
[install]
-install_scripts=@prefix@/usr/sbin
+install_scripts=@prefix@/usr/sbin
+prefix=@prefix@/usr
View
94 clc/eucadmin/setup.py
@@ -29,46 +29,72 @@
#
# Author: Mitch Garnaat mgarnaat@eucalyptus.com
+import sys
+import os
from distutils.core import setup
+from distutils.sysconfig import get_python_lib
+import fileinput
+import ConfigParser
-setup(name = "eucadmin",
- version = '0.1',
- description = "Eucalyptus Admin Tools",
+cfg = ConfigParser.ConfigParser()
+cfg.read('setup.cfg')
+prefix = os.path.dirname(cfg.get('install', 'prefix'))
+install_scripts = cfg.get('install', 'install_scripts')
+path_header = 'import sys\nsys.path.append(\"%s/%s\")\n' % (prefix, get_python_lib())
+
+binaries = ["bin/euca-add-user", "bin/euca-add-user-group",
+ "bin/euca-delete-user", "bin/euca-delete-user-group",
+ "bin/euca-add-user", "bin/euca-add-user-group",
+ "bin/euca_conf", "bin/euca-delete-user",
+ "bin/euca-delete-user-group",
+ "bin/euca-deregister-cluster",
+ "bin/euca-deregister-storage-controller",
+ "bin/euca-deregister-walrus",
+ "bin/euca-describe-clusters",
+ "bin/euca-describe-components",
+ "bin/euca-describe-properties",
+ "bin/euca-describe-services",
+ "bin/euca-describe-storage-controllers",
+ "bin/euca-describe-user-groups",
+ "bin/euca-describe-users",
+ "bin/euca-describe-walruses",
+ "bin/euca-get-credentials",
+ "bin/euca-modify-cluster",
+ "bin/euca-modify-property",
+ "bin/euca-modify-storage-controller",
+ "bin/euca-modify-walrus",
+ "bin/euca-register-cluster",
+ "bin/euca-register-storage-controller",
+ "bin/euca-register-walrus"]
+mangled = [ "%s/%s" % (install_scripts,os.path.basename(x)) for x in binaries ]
+
+setup(name="eucadmin",
+ version='0.1',
+ description="Eucalyptus Admin Tools",
long_description="CLI tools to help administer Eucalyptus",
- author = "Mitch Garnaat",
- author_email = "mgarnaat@eucalyptus.com",
- scripts = ["bin/euca-add-user", "bin/euca-add-user-group",
- "bin/euca-delete-user", "bin/euca-delete-user-group",
- "bin/euca-add-user", "bin/euca-add-user-group",
- "bin/euca_conf", "bin/euca-delete-user",
- "bin/euca-delete-user-group",
- "bin/euca-deregister-cluster",
- "bin/euca-deregister-storage-controller",
- "bin/euca-deregister-walrus",
- "bin/euca-describe-clusters",
- "bin/euca-describe-components",
- "bin/euca-describe-properties",
- "bin/euca-describe-services",
- "bin/euca-describe-storage-controllers",
- "bin/euca-describe-user-groups",
- "bin/euca-describe-users",
- "bin/euca-describe-walruses",
- "bin/euca-get-credentials",
- "bin/euca-modify-cluster",
- "bin/euca-modify-property",
- "bin/euca-modify-storage-controller",
- "bin/euca-modify-walrus",
- "bin/euca-register-cluster",
- "bin/euca-register-storage-controller",
- "bin/euca-register-walrus"],
- url = "http://eucalyptus.com/",
- packages = ['eucadmin'],
- license = 'BSD',
- platforms = 'Posix; MacOS X; Windows',
- classifiers = [ 'Development Status :: 5 - Production/Stable',
+ author="Mitch Garnaat",
+ author_email="mgarnaat@eucalyptus.com",
+ scripts=binaries,
+ url="http://eucalyptus.com/",
+ packages=['eucadmin'],
+ license='BSD',
+ platforms='Posix; MacOS X; Windows',
+ classifiers=[ 'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Topic :: Internet',
],
)
+
+if 'install' in sys.argv[1:]:
+ for line in fileinput.input(mangled, inplace=1,backup=None):
+ if fileinput.isfirstline():
+ print line,
+ print path_header,
+ elif line == 'import sys\n':
+ continue
+ elif line.startswith('sys.path.append'):
+ continue
+ else:
+ print line,
View
6 clc/modules/bootstrap/src/main/native/arguments.ggo
@@ -5,7 +5,7 @@ version "eee-3.0.0"
###### long-opt # short # description # type # type desc. # default value # req. # extras...
section "Bootstrap Configuration"# # # # # #
option "user" u "User to drop privs to after starting." string typestr="USERNAME" default="eucalyptus" no
-option "home" h "Eucalyptus home directory." string typestr="DIRECTORY" default="/opt/eucalyptus/nurmi_eee_mergetest-root/" no
+option "home" h "Eucalyptus home directory." string typestr="DIRECTORY" default="/opt/grze_eee/" no
option "initialize" - "Perform first-time setup. This is run one time (only!) on the first cloud controller before the first time it is run." flag off
option "bind-addr" b "Specifying this option causes eucalyptus-cloud to only bind the specified local addresses. The default behaviour is to listen on the any address." string typestr="IP_ADDRESS" optional multiple
@@ -13,7 +13,7 @@ option "bind-addr" b "Specifying this option causes eucalyptus-clo
option "define" D "Set system properties." string optional multiple
option "fork" f "Fork and daemonize Eucalyptus." flag off
option "kill" k "Kill a daemonized Eucalyptus." flag off
-option "pidfile" - "Location for the pidfile." string typestr="FILENAME" default="/opt/eucalyptus/nurmi_eee_mergetest-root/var/run/eucalyptus-cloud.pid" no
+option "pidfile" - "Location for the pidfile." string typestr="FILENAME" default="/opt/grze_eee/var/run/eucalyptus-cloud.pid" no
###### # # # # # # #
###### long-opt # short # description # type # type desc. # default value # req. # extras...
section "Logging Configuration" # # # # # #
@@ -40,7 +40,7 @@ option "disable-vmwarebroker" - "DEPRECATED DO NOT USE. IT DOES NOTHING."
###### # # # # # # #
###### long-opt # short # description # type # type desc. # default value # req. # extras...
section "Java Options" # # # # # # #
-option "java-home" j "Alternative way to specify JAVA_HOME." string typestr="DIRECTORY" default="/opt/eucalyptus/nurmi_eee_mergetest-root/packages/jdk/" no
+option "java-home" j "Alternative way to specify JAVA_HOME." string typestr="DIRECTORY" default="/usr/lib/jvm/java-6-openjdk/" no
option "jvm-name" - "Which JVM type to run (see jvm.cfg)." string typestr="JVMNAME" default="-server" no hidden
option "jvm-args" X "Arguments to pass to the JVM." string optional multiple
option "debug" d "Launch with debugger enabled." flag off
View
2  clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Cluster.java
@@ -208,7 +208,7 @@ public void fire( Cluster t ) {
on( Transition.INIT_CERTS )//
.from( State.AUTHENTICATING ).to( State.STARTING ).error( State.DOWN ).run( newRefresh( ClusterCertsCallback.class ) );
-// on( Transition.INIT_SERVICES ).from( State.CHECKING_SERVICE ).to( State.STARTING ).error( State.STARTING ).run( newRefresh( ServiceStateCallback.class ) );
+ on( Transition.INIT_SERVICES ).from( State.CHECKING_SERVICE ).to( State.STARTING ).error( State.STARTING ).run( newRefresh( ServiceStateCallback.class ) );
on( Transition.INIT_RESOURCES ).from( State.STARTING ).to( State.STARTING_RESOURCES ).error( State.DOWN ).run( newRefresh( ResourceStateCallback.class ) );
on( Transition.INIT_NET ).from( State.STARTING_RESOURCES ).to( State.STARTING_NET ).error( State.DOWN ).run( newRefresh( NetworkStateCallback.class ) );
on( Transition.INIT_VMS ).from( State.STARTING_NET ).to( State.STARTING_VMS ).error( State.DOWN ).run( newRefresh( VmStateCallback.class ) );
View
10 ...s/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ServiceStateCallback.java
@@ -17,5 +17,15 @@ public ServiceStateCallback( ) {
public void fire( DescribeServicesResponseType msg ) {
LOG.debug( msg );
}
+
+ @Override
+ public void initialize( DescribeServicesType request ) throws Exception {
+ LOG.debug( request );
+ }
+
+ @Override
+ public void fireException( Throwable t ) {
+ LOG.error( t, t );
+ }
}
Please sign in to comment.
Something went wrong with that request. Please try again.