summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-25 00:00:35 +0000
committerGerrit Code Review <review@openstack.org>2012-01-25 00:00:35 +0000
commita99f429591b5efcbcc21a618190e4bef7d9fba38 (patch)
tree44af4b0a6db6b6b335ca974f00ec67e2bc624b47 /bin
parent5156c0e757859b0823ebd35e77e660e9f5726811 (diff)
parent0c5273c85ea72d60e5907acb22398584ded0a077 (diff)
Merge "Create nova cert worker for x509 support"
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-all2
-rwxr-xr-xbin/nova-cert47
2 files changed, 48 insertions, 1 deletions
diff --git a/bin/nova-all b/bin/nova-all
index 9c9e2bbaa..806c2d002 100755
--- a/bin/nova-all
+++ b/bin/nova-all
@@ -65,7 +65,7 @@ if __name__ == '__main__':
except (Exception, SystemExit):
logging.exception(_('Failed to load %s') % 'objectstore-wsgi')
for binary in ['nova-xvpvncproxy', 'nova-compute', 'nova-volume',
- 'nova-network', 'nova-scheduler', 'nova-vsa']:
+ 'nova-network', 'nova-scheduler', 'nova-vsa', 'nova-cert']:
try:
servers.append(service.Service.create(binary=binary))
except (Exception, SystemExit):
diff --git a/bin/nova-cert b/bin/nova-cert
new file mode 100755
index 000000000..725bf4aee
--- /dev/null
+++ b/bin/nova-cert
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 OpenStack, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+"""Starter script for Nova Cert."""
+
+import eventlet
+eventlet.monkey_patch()
+
+import os
+import sys
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+ os.pardir,
+ os.pardir))
+if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
+ sys.path.insert(0, POSSIBLE_TOPDIR)
+
+
+from nova import flags
+from nova import log as logging
+from nova import service
+from nova import utils
+
+if __name__ == '__main__':
+ utils.default_flagfile()
+ flags.FLAGS(sys.argv)
+ logging.setup()
+ utils.monkey_patch()
+ server = service.Service.create(binary='nova-cert')
+ service.serve(server)
+ service.wait()