Some tiny reorderings.

This commit is contained in:
Joshua Harlow 2012-02-06 21:12:00 -08:00
parent 8dec3548b9
commit 45db1ba5f1
15 changed files with 28 additions and 43 deletions

@ -24,10 +24,9 @@ from devstack import utils
import time
LOG = logging.getLogger("devstack.components.db")
#id
TYPE = settings.DB
LOG = logging.getLogger("devstack.components.db")
#used for special setups
MYSQL = 'mysql'

@ -29,10 +29,9 @@ from devstack.components import keystone
from devstack.image import creator
LOG = logging.getLogger("devstack.components.glance")
#id
TYPE = settings.GLANCE
LOG = logging.getLogger("devstack.components.glance")
#config files/sections
API_CONF = "glance-api.conf"

@ -25,6 +25,7 @@ from devstack import utils
#id
TYPE = settings.HORIZON
LOG = logging.getLogger("devstack.components.horizon")
#actual dir names
ROOT_HORIZON = 'horizon'
@ -81,8 +82,6 @@ RHEL_HTTPD_CONF = '/etc/httpd/conf/httpd.conf'
#users which apache may not like starting as
BAD_APACHE_USERS = ['root']
LOG = logging.getLogger("devstack.components.horizon")
#apache logs will go here
LOGS_DIR = "logs"

@ -25,10 +25,9 @@ from devstack import utils
from devstack.components import db
LOG = logging.getLogger("devstack.components.keystone")
#id
TYPE = settings.KEYSTONE
LOG = logging.getLogger("devstack.components.keystone")
#this db will be dropped then created
DB_NAME = "keystone"

@ -20,10 +20,9 @@ from devstack import settings
from devstack import shell as sh
from devstack import utils
LOG = logging.getLogger("devstack.components.keystone_client")
#id
TYPE = settings.KEYSTONE_CLIENT
LOG = logging.getLogger("devstack.components.keystone_client")
#the pkg json files keystone client requires for installation
REQ_PKGS = ['general.json', 'keystone-client.json']

@ -26,10 +26,9 @@ from devstack import utils
from devstack.components import db
LOG = logging.getLogger("devstack.components.melange")
#id
TYPE = settings.MELANGE
LOG = logging.getLogger("devstack.components.melange")
#the pkg json files melange requires for installation
REQ_PKGS = ['general.json', 'melange.json']

@ -20,10 +20,9 @@ from devstack import settings
from devstack import shell as sh
from devstack import utils
LOG = logging.getLogger("devstack.components.melange_client")
#id
TYPE = settings.MELANGE_CLIENT
LOG = logging.getLogger("devstack.components.melange_client")
#the pkg json files melange client requires for installation
REQ_PKGS = ['general.json']

@ -29,6 +29,9 @@ from devstack import utils
from devstack.components import db
from devstack.components import keystone
#id
TYPE = settings.NOVA
LOG = logging.getLogger('devstack.components.nova')
#special generatedconf
@ -41,14 +44,13 @@ CONFIGS = [PASTE_CONF]
#this db will be dropped then created
DB_NAME = 'nova'
#id
TYPE = settings.NOVA
#this makes the database be in sync with nova
DB_SYNC_CMD = [
{'cmd': ['%BINDIR%/nova-manage', '--flagfile', '%CFGFILE%',
'db', 'sync']},
]
#these setup your dev network
NETWORK_SETUP_CMDS = [
#this always happens (even in quantum mode)
{'cmd': ['%BINDIR%/nova-manage', '--flagfile', '%CFGFILE%',
@ -61,31 +63,27 @@ NETWORK_SETUP_CMDS = [
'--pool=%TEST_FLOATING_POOL%']}
]
#these are used for nova volumens
VG_CHECK_CMD = [
{'cmd': ['vgs', '%VOLUME_GROUP%'],
'run_as_root': True}
]
VG_DEV_CMD = [
{'cmd': ['losetup', '-f', '--show', '%VOLUME_BACKING_FILE%'],
'run_as_root': True}
]
VG_CREATE_CMD = [
{'cmd': ['vgcreate', '%VOLUME_GROUP%', '%DEV%'],
'run_as_root': True}
]
VG_LVS_CMD = [
{'cmd': ['lvs', '--noheadings', '-o', 'lv_name', '%VOLUME_GROUP%'],
'run_as_root': True}
]
VG_LVREMOVE_CMD = [
{'cmd': ['lvremove', '-f', '%VOLUME_GROUP%/%LV%'],
'run_as_root': True}
]
RESTART_TGT_CMD = [
{'cmd': ['stop', 'tgt'], 'run_as_root': True},
{'cmd': ['start', 'tgt'], 'run_as_root': True}
@ -104,7 +102,6 @@ NXVNC = "xvnc"
SUBCOMPONENTS = [NCPU, NVOL, NAPI,
NOBJ, NNET, NCERT, NSCHED, NCAUTH, NXVNC]
#the pkg json files nova requires for installation
REQ_PKGS = ['general.json', 'nova.json']
@ -179,7 +176,9 @@ QUANTUM_OPENSWITCH_OPS = {
}
#ensure libvirt restarted (seems to only be on rhel)
LIBVIRTD_RESTART = ['service', 'libvirtd', 'restart']
LIBVIRT_RESTART_CMD = {
settings.RHEL6: ['service', 'libvirtd', 'restart'],
}
#pip files that nova requires
REQ_PIPS = ['general.json', 'nova.json']
@ -408,8 +407,9 @@ class NovaRuntime(comp.PythonRuntime):
def pre_start(self):
#ensure libvirt started
if self.distro == settings.RHEL6:
sh.execute(*LIBVIRTD_RESTART, run_as_root=True)
cmd = LIBVIRT_RESTART_CMD.get(self.distro)
if cmd:
sh.execute(*cmd, run_as_root=True)
def _get_param_map(self, app_name):
params = comp.PythonRuntime._get_param_map(self, app_name)

@ -20,10 +20,9 @@ from devstack import settings
from devstack import shell as sh
from devstack import utils
LOG = logging.getLogger("devstack.components.nova_client")
#id
TYPE = settings.NOVA_CLIENT
LOG = logging.getLogger("devstack.components.nova_client")
#the pkg json files nova client requires for installation
REQ_PKGS = ['general.json', 'nova-client.json']

@ -22,10 +22,9 @@ from devstack import utils
from devstack.components import nova
LOG = logging.getLogger("devstack.components.novnc")
#id
TYPE = settings.NOVNC
LOG = logging.getLogger("devstack.components.novnc")
#where the application is really
UTIL_DIR = 'utils'

@ -25,6 +25,8 @@ from devstack import utils
from devstack.components import db
#id
TYPE = settings.QUANTUM
LOG = logging.getLogger("devstack.components.quantum")
#vswitch pkgs
@ -49,9 +51,6 @@ OVS_BRIDGE_DEL = ['ovs-vsctl', '--no-wait', '--', '--if-exists', 'del-br', '%OVS
OVS_BRIDGE_ADD = ['ovs-vsctl', '--no-wait', 'add-br', '%OVS_BRIDGE%']
OVS_BRIDGE_EXTERN_ID = ['ovs-vsctl', '--no-wait', 'br-set-external-id', '%OVS_BRIDGE%', 'bridge-id', '%OVS_EXTERNAL_ID%']
#id
TYPE = settings.QUANTUM
#special component options
QUANTUM_SERVICE = 'q-svc'
QUANTUM_AGENT = 'q-agt'

@ -20,10 +20,9 @@ from devstack import settings
from devstack import shell as sh
from devstack import utils
LOG = logging.getLogger("devstack.components.quantum_client")
#id
TYPE = settings.QUANTUM_CLIENT
LOG = logging.getLogger("devstack.components.quantum_client")
#the pkg json files quantum client requires for installation
REQ_PKGS = ['general.json', 'quantum-client.json']

@ -25,10 +25,9 @@ from devstack import shell as sh
from devstack import trace as tr
from devstack import utils
LOG = logging.getLogger("devstack.components.rabbit")
#id
TYPE = settings.RABBIT
LOG = logging.getLogger("devstack.components.rabbit")
#hopefully these are distro independent..
START_CMD = ['service', "rabbitmq-server", "start"]

@ -19,11 +19,11 @@ from devstack import log as logging
from devstack import settings
from devstack import shell as sh
LOG = logging.getLogger("devstack.components.swift")
# id
TYPE = settings.SWIFT
LOG = logging.getLogger("devstack.components.swift")
#swift has alot of config files!
SWIFT_CONF = 'swift.conf'
PROXY_SERVER_CONF = 'proxy-server.conf'
ACCOUNT_SERVER_CONF = 'account-server.conf'
@ -38,8 +38,6 @@ CONFIGS = [SWIFT_CONF, PROXY_SERVER_CONF, ACCOUNT_SERVER_CONF,
CONTAINER_SERVER_CONF, OBJECT_SERVER_CONF, RSYNC_CONF,
SYSLOG_CONF, SWIFT_MAKERINGS, SWIFT_STARTMAIN]
SWIFT_NAME = 'swift'
# subdirs of the git checkout
BIN_DIR = 'bin'
CONFIG_DIR = 'etc'

@ -23,10 +23,9 @@ from devstack import settings
from devstack import shell as sh
from devstack import utils
LOG = logging.getLogger("devstack.components.swift_keystone")
# id
TYPE = settings.SWIFT_KEYSTONE
LOG = logging.getLogger("devstack.components.swift_keystone")
#the pkg json files swift_keystone requires for installation
REQ_PKGS = ['general.json']