x/anvil
Code Issues Proposed changes

Fixed json.

Browse Source
This commit is contained in:
Joshua Harlow 2012-01-31 16:49:03 -08:00
parent 251fdc2b86
commit 04ca4b0c24
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/pkgs/rabbitmq.json
View File

@ -14,7 +14,7 @@
# Requires EPEL # Requires EPEL
"rabbitmq-server": { "rabbitmq-server": {
"version": "2.6*", "version": "2.6*",
"removable": true "removable": true,
"pre-install": [ "pre-install": [
{ {
# Qpidd runs on the same port # Qpidd runs on the same port

6
devstack/components/rabbit.py
View File

@ -55,7 +55,7 @@ class RabbitUninstaller(comp.PkgUninstallComponent):
def pre_uninstall(self): def pre_uninstall(self):
try: try:
self.runtime.restart() self.runtime.restart()
LOG.info("Resetting the guest password to %s", RESET_BASE_PW) LOG.info("Resetting the guest password to \"%s\"", RESET_BASE_PW)
cmd = PWD_CMD + [RESET_BASE_PW] cmd = PWD_CMD + [RESET_BASE_PW]
sh.execute(*cmd, run_as_root=True) sh.execute(*cmd, run_as_root=True)
except IOError: except IOError:
@ -69,7 +69,7 @@ class RabbitInstaller(comp.PkgInstallComponent):
self.runtime = RabbitRuntime(*args, **kargs) self.runtime = RabbitRuntime(*args, **kargs)
def _setup_pw(self): def _setup_pw(self):
LOG.info("Setting up your rabbit-mq guest password") LOG.info("Setting up your rabbit-mq guest password.")
self.runtime.restart() self.runtime.restart()
passwd = self.cfg.get("passwords", "rabbit") passwd = self.cfg.get("passwords", "rabbit")
cmd = PWD_CMD + [passwd] cmd = PWD_CMD + [passwd]
@ -131,7 +131,7 @@ class RabbitRuntime(comp.EmptyRuntime):
def restart(self): def restart(self):
LOG.info("Restarting rabbitmq") LOG.info("Restarting rabbitmq")
self._run_cmd(RESTART_CMD) self._run_cmd(RESTART_CMD)
LOG.info("Please wait %s seconds while it starts up" % (WAIT_ON_TIME)) LOG.info("Please wait %s seconds while it starts up." % (WAIT_ON_TIME))
time.sleep(WAIT_ON_TIME) time.sleep(WAIT_ON_TIME)
return 1 return 1