diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-12 09:12:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-12 09:12:00 +0000 |
| commit | 0d7c208abc4d55c2aabc2af4499cf65e978a6ca4 (patch) | |
| tree | a3db6e2e49ec57421a6e8cb53b987ab675bc3236 /bin | |
| parent | 4f9d721de3fa0851497afb92c99aa06fce2ce453 (diff) | |
| parent | f5a94c7c2cdf090659689fb3194e7e045a1ea2d4 (diff) | |
| download | nova-0d7c208abc4d55c2aabc2af4499cf65e978a6ca4.tar.gz nova-0d7c208abc4d55c2aabc2af4499cf65e978a6ca4.tar.xz nova-0d7c208abc4d55c2aabc2af4499cf65e978a6ca4.zip | |
Merge "Handle waiting for conductor in nova.service."
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-compute | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/nova-compute b/bin/nova-compute index d93ddb5bd..8826015d4 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -55,6 +55,7 @@ if __name__ == '__main__': logging.setup('nova') utils.monkey_patch() server = service.Service.create(binary='nova-compute', - topic=CONF.compute_topic) + topic=CONF.compute_topic, + db_allowed=False) service.serve(server) service.wait() |