Changes for NovaConf
This commit is contained in:
parent
e9e8f05897
commit
b19037d75e
@ -10,6 +10,8 @@
|
||||
# Set api host endpoint
|
||||
host_ip = ${HOST_IP:-}
|
||||
|
||||
rabbit_host = ${RABBIT_HOST:-localhost}
|
||||
|
||||
#Sys log enabled or not
|
||||
syslog = 0
|
||||
|
||||
@ -52,10 +54,33 @@ nova_url = ${NOVA_URL:-http://$HOST_IP:5000/v2.0/}
|
||||
# needs to match the config of your catalog returned by Keystone.
|
||||
nova_version = ${NOVA_VERSION:-1.1}
|
||||
|
||||
[ec2]
|
||||
scheduler = ${NOVA_SCHEDULER:--nova.scheduler.simple.SimpleScheduler}
|
||||
fixed_range = ${NOVA_FIXED_RANGE:-10.0.0.0/24}
|
||||
network_manager = ${NET_MAN:-FlatDHCPManager}
|
||||
volume_group = ${VOLUME_GROUP:-nova-volumes}
|
||||
volume_name_prefix =${VOLUME_NAME_PREFIX:-volume-}
|
||||
public_interface = ${PUBLIC_INTERFACE:-eth0}
|
||||
# The default values for these next two depends on other values. We'll
|
||||
# deal with that in the code
|
||||
vlan_interface = ${VLAN_INTERFACE:-}
|
||||
vncproxy_url = ${VNCPROXY_URL:-}
|
||||
ec2_dmz_host =${EC2_DMZ_HOST:-}
|
||||
|
||||
# Set the ec2 url so euca2ools works
|
||||
ec2_url = ${EC2_URL:-http://$HOST_IP:8773/services/Cloud}
|
||||
instance_name_prefix =${INSTANCE_NAME_PREFIX:-instance-}
|
||||
instances_path = ${INSTANCES_PATH:-}
|
||||
|
||||
multi_host = ${MULTI_HOST:-0}
|
||||
|
||||
virt_driver = ${VIRT_DRIVER:-libvirt}
|
||||
libvirt_type =${LIBVIRT_TYPE:-kvm}
|
||||
extra_flags = ${NOVA_EXTRA_FLAGS:-}
|
||||
flat_network_bridge = ${FLAT_NETWORK_BRIDGE:-br100}
|
||||
flat_interface = ${FLAT_INTERFACE:-eth0}
|
||||
|
||||
[EC2]
|
||||
|
||||
# SET THE EC2 URL SO EUCA2OOLS WORKS
|
||||
EC2_URL = ${EC2_URL:-HTTP://$HOST_IP:8773/SERVICES/CLOUD}
|
||||
|
||||
# Access key is set in the initial keystone data to be the same as username
|
||||
ec2_access_key = ${USERNAME:-demo}
|
||||
@ -120,6 +145,11 @@ openstackx_branch = master
|
||||
quantum_repo = https://github.com/openstack/quantum
|
||||
quantum_branch = master
|
||||
|
||||
[quantum]
|
||||
q_host= ${Q_HOST:-localhost}
|
||||
q_port = ${Q_PORT:-9696}
|
||||
q_plugin = ${Q_PLUGIN:-openvswitch}
|
||||
|
||||
[ci]
|
||||
|
||||
# CI test suite
|
||||
|
@ -17,18 +17,54 @@
|
||||
import Logger
|
||||
from Component import (ComponentBase, RuntimeComponent,
|
||||
UninstallComponent, InstallComponent)
|
||||
import os
|
||||
|
||||
LOG = Logger.getLogger("install.nova")
|
||||
API_CONF = "nova.conf"
|
||||
CONFIGS = [API_CONF]
|
||||
DB_NAME = "nova"
|
||||
#
|
||||
|
||||
TYPE = NOVA
|
||||
|
||||
#what to start
|
||||
# Does this start nova-compute, nova-volume, nova-network, nova-scheduler
|
||||
# and optionally nova-wsproxy?
|
||||
#APP_OPTIONS = {
|
||||
# 'glance-api': ['--config-file', joinpths('%ROOT%', "etc", API_CONF)],
|
||||
# 'glance-registry': ['--config-file', joinpths('%ROOT%', "etc", REG_CONF)]
|
||||
#}
|
||||
|
||||
class NovaUninstaller(UninstallComponent):
|
||||
def __init__(self, *args, **kargs):
|
||||
pass
|
||||
PythonUninstallComponent.__init__(self, TYPE, *args, **kargs)
|
||||
#self.cfgdir = joinpths(self.appdir, CONFIG_ACTUAL_DIR)
|
||||
|
||||
|
||||
class NovaInstaller(InstallComponent):
|
||||
def __init__(self, *args, **kargs):
|
||||
pass
|
||||
PythonInstallComponent.__init__(self, TYPE, *args, **kargs)
|
||||
self.gitloc = self.cfg.get("git", "nova_repo")
|
||||
self.brch = self.cfg.get("git", "nova_branch")
|
||||
#self.cfgdir = joinpths(self.appdir, CONFIG_ACTUAL_DIR)
|
||||
|
||||
def _get_download_location(self):
|
||||
#where we get nova from
|
||||
return (self.gitloc, self.brch)
|
||||
|
||||
def _get_config_files(self):
|
||||
#these are the config files we will be adjusting
|
||||
return list(CONFIGS)
|
||||
|
||||
def _config_adjust(self, contents, fn):
|
||||
nc = NovaConf.NovaConf(self)
|
||||
lines = nc.generate()
|
||||
return os.linesep.join(lines)
|
||||
|
||||
def _get_param_map(self, fn=None):
|
||||
# Not used. NovaConf will be used to generate the config file
|
||||
mp = dict()
|
||||
return mp
|
||||
|
||||
|
||||
class NovaRuntime(RuntimeComponent):
|
||||
|
Loading…
x
Reference in New Issue
Block a user