Naming and output cleanups

This commit is contained in:
Joshua Harlow 2012-03-26 23:36:38 -07:00
parent fdd2550520
commit 1e0b61e88a
2 changed files with 6 additions and 6 deletions
conf/templates/nova
devstack/components

@ -4,15 +4,15 @@ set -o xtrace
set -o errexit
# Create a small network
%BIN_DIR%/nova-manage --flagfile %CFG_FILE% network create private %FIXED_RANGE% 1 %FIXED_NETWORK_SIZE%
nova-manage --flagfile %CFG_FILE% network create private %FIXED_RANGE% 1 %FIXED_NETWORK_SIZE%
if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
echo "Not creating floating IPs (not supported by Quantum)"
if [[ "$ENABLED_SERVICES" =~ "quantum-server" ]]; then
echo "Not creating floating IPs (not supported by quantum server)"
else
# Create some floating ips
%BIN_DIR%/nova-manage --flagfile %CFG_FILE% floating create %FLOATING_RANGE%
nova-manage --flagfile %CFG_FILE% floating create %FLOATING_RANGE%
# Create a second pool
%BIN_DIR%/nova-manage --flagfile %CFG_FILE% floating create --ip_range=%TEST_FLOATING_RANGE% --pool=%TEST_FLOATING_POOL%
nova-manage --flagfile %CFG_FILE% floating create --ip_range=%TEST_FLOATING_RANGE% --pool=%TEST_FLOATING_POOL%
fi

@ -390,7 +390,7 @@ class NovaRuntime(NovaMixin, comp.PythonRuntime):
env = dict()
env['ENABLED_SERVICES'] = ",".join(self.instances.keys())
setup_cmd = NET_INIT_CMD_ROOT + [tgt_fn]
LOG.info("Running (%s) command to initialize nova's network." % (" ".join(setup_cmd)))
LOG.info("Running %r command to initialize nova's network." % (" ".join(setup_cmd)))
sh.execute(*setup_cmd, env_overrides=env, run_as_root=False)
self._backup_network_init(tgt_fn, env)