x/packstack
Code Issues Proposed changes

Added hostname processor to all plugins which require it

Browse Source
This commit is contained in:
Martin Magr
2012-12-17 15:08:13 +01:00
parent 927b4b004a
commit 412b0a655c
7 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packstack/plugins/dashboard_500.py
View File

@@ -6,6 +6,7 @@ import logging
import uuid import uuid
import packstack.installer.engine_validators as validate import packstack.installer.engine_validators as validate
import packstack.installer.engine_processors as process
from packstack.installer import basedefs from packstack.installer import basedefs
import packstack.installer.common_utils as utils import packstack.installer.common_utils as utils
@@ -31,6 +32,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validatePing, "VALIDATION_FUNC" : validate.validatePing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_HORIZON_HOST", "CONF_NAME" : "CONFIG_HORIZON_HOST",

5
packstack/plugins/glance_200.py
View File

@@ -5,6 +5,7 @@ Installs and configures Glance
import logging import logging
import packstack.installer.engine_validators as validate import packstack.installer.engine_validators as validate
import packstack.installer.engine_processors as process
from packstack.installer import basedefs from packstack.installer import basedefs
import packstack.installer.common_utils as utils import packstack.installer.common_utils as utils
@@ -30,6 +31,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validatePing, "VALIDATION_FUNC" : validate.validatePing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_GLANCE_HOST", "CONF_NAME" : "CONFIG_GLANCE_HOST",
@@ -67,4 +71,3 @@ def createmanifest():
manifestfile = "%s_glance.pp"%controller.CONF['CONFIG_GLANCE_HOST'] manifestfile = "%s_glance.pp"%controller.CONF['CONFIG_GLANCE_HOST']
manifestdata = getManifestTemplate("glance.pp") manifestdata = getManifestTemplate("glance.pp")
appendManifestFile(manifestfile, manifestdata) appendManifestFile(manifestfile, manifestdata)

4
packstack/plugins/keystone_100.py
View File

@@ -7,6 +7,7 @@ import uuid
import packstack.installer.engine_validators as validate import packstack.installer.engine_validators as validate
import packstack.installer.engine_processors as process
from packstack.installer import basedefs from packstack.installer import basedefs
import packstack.installer.common_utils as utils import packstack.installer.common_utils as utils
@@ -32,6 +33,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validatePing, "VALIDATION_FUNC" : validate.validatePing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_KEYSTONE_HOST", "CONF_NAME" : "CONFIG_KEYSTONE_HOST",

18
packstack/plugins/nova_300.py
View File

@@ -6,6 +6,7 @@ import logging
import os import os
import packstack.installer.engine_validators as validate import packstack.installer.engine_validators as validate
import packstack.installer.engine_processors as process
import packstack.installer.common_utils as utils import packstack.installer.common_utils as utils
from packstack.modules.ospluginutils import NovaConfig, getManifestTemplate, appendManifestFile, manifestfiles from packstack.modules.ospluginutils import NovaConfig, getManifestTemplate, appendManifestFile, manifestfiles
@@ -28,6 +29,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validatePing, "VALIDATION_FUNC" : validate.validatePing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_NOVA_API_HOST", "CONF_NAME" : "CONFIG_NOVA_API_HOST",
@@ -40,6 +44,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validatePing, "VALIDATION_FUNC" : validate.validatePing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_NOVA_CERT_HOST", "CONF_NAME" : "CONFIG_NOVA_CERT_HOST",
@@ -52,6 +59,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validateMultiPing, "VALIDATION_FUNC" : validate.validateMultiPing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_NOVA_VNCPROXY_HOST", "CONF_NAME" : "CONFIG_NOVA_VNCPROXY_HOST",
@@ -66,7 +76,7 @@ def initConfig(controllerObject):
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_NOVA_COMPUTE_HOSTS", "CONF_NAME" : "CONFIG_NOVA_COMPUTE_HOSTS", # TO-DO: Create processor for CSV
"USE_DEFAULT" : False, "USE_DEFAULT" : False,
"NEED_CONFIRM" : False, "NEED_CONFIRM" : False,
"CONDITION" : False }, "CONDITION" : False },
@@ -100,6 +110,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validatePing, "VALIDATION_FUNC" : validate.validatePing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_NOVA_NETWORK_HOST", "CONF_NAME" : "CONFIG_NOVA_NETWORK_HOST",
@@ -160,6 +173,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validatePing, "VALIDATION_FUNC" : validate.validatePing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_NOVA_SCHED_HOST", "CONF_NAME" : "CONFIG_NOVA_SCHED_HOST",

4
packstack/plugins/openstack_client_400.py
View File

@@ -5,6 +5,7 @@ Installs and configures an openstack client
import logging import logging
import packstack.installer.engine_validators as validate import packstack.installer.engine_validators as validate
import packstack.installer.engine_processors as process
from packstack.installer import basedefs from packstack.installer import basedefs
import packstack.installer.common_utils as utils import packstack.installer.common_utils as utils
@@ -30,6 +31,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validatePing, "VALIDATION_FUNC" : validate.validatePing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_OSCLIENT_HOST", "CONF_NAME" : "CONFIG_OSCLIENT_HOST",

4
packstack/plugins/qpid_002.py
View File

@@ -5,6 +5,7 @@ Installs and configures qpid
import logging import logging
import packstack.installer.engine_validators as validate import packstack.installer.engine_validators as validate
import packstack.installer.engine_processors as process
from packstack.installer import basedefs from packstack.installer import basedefs
import packstack.installer.common_utils as utils import packstack.installer.common_utils as utils
@@ -30,6 +31,9 @@ def initConfig(controllerObject):
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validatePing, "VALIDATION_FUNC" : validate.validatePing,
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"PROCESSOR_ARGS" : {"allow_localhost": True},
"PROCESSOR_FUNC" : process.processHost,
"PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_QPID_HOST", "CONF_NAME" : "CONFIG_QPID_HOST",

11
packstack/plugins/swift_600.py
View File

@@ -6,6 +6,7 @@ import logging
import os import os
import packstack.installer.engine_validators as validate import packstack.installer.engine_validators as validate
import packstack.installer.engine_processors as process
from packstack.installer import basedefs from packstack.installer import basedefs
import packstack.installer.common_utils as utils import packstack.installer.common_utils as utils
@@ -33,7 +34,7 @@ def initConfig(controllerObject):
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_SWIFT_PROXY_HOSTS", "CONF_NAME" : "CONFIG_SWIFT_PROXY_HOSTS", # TO-DO: Create processor for CSV
"USE_DEFAULT" : False, "USE_DEFAULT" : False,
"NEED_CONFIRM" : False, "NEED_CONFIRM" : False,
"CONDITION" : False }, "CONDITION" : False },
@@ -45,7 +46,7 @@ def initConfig(controllerObject):
"DEFAULT_VALUE" : "127.0.0.1", "DEFAULT_VALUE" : "127.0.0.1",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_SWIFT_STORAGE_HOSTS", "CONF_NAME" : "CONFIG_SWIFT_STORAGE_HOSTS", # TO-DO: Create processor for CSV
"USE_DEFAULT" : False, "USE_DEFAULT" : False,
"NEED_CONFIRM" : False, "NEED_CONFIRM" : False,
"CONDITION" : False }, "CONDITION" : False },
@@ -128,7 +129,7 @@ def parseDevices(config_swift_storage_hosts):
devices.append({'host':host, 'device':device, 'device_name':'device%s'%device_number, 'zone':str(zone)}) devices.append({'host':host, 'device':device, 'device_name':'device%s'%device_number, 'zone':str(zone)})
return devices return devices
# The ring file should be built and distributed befor the storage services # The ring file should be built and distributed befor the storage services
# come up. Specifically the replicator crashes if the ring isn't present # come up. Specifically the replicator crashes if the ring isn't present
def createbuildermanifest(): def createbuildermanifest():
# TODO : put this on the proxy server, will need to change this later # TODO : put this on the proxy server, will need to change this later
@@ -142,7 +143,7 @@ def createbuildermanifest():
host = device['host'] host = device['host']
devicename = device['device_name'] devicename = device['device_name']
zone = device['zone'] zone = device['zone']
manifestdata = manifestdata + '\n@@ring_object_device { "%s:6000/%s":\n zone => %s,\n weight => 10, }'%(host, devicename, zone) manifestdata = manifestdata + '\n@@ring_object_device { "%s:6000/%s":\n zone => %s,\n weight => 10, }'%(host, devicename, zone)
manifestdata = manifestdata + '\n@@ring_container_device { "%s:6001/%s":\n zone => %s,\n weight => 10, }'%(host, devicename, zone) manifestdata = manifestdata + '\n@@ring_container_device { "%s:6001/%s":\n zone => %s,\n weight => 10, }'%(host, devicename, zone)
manifestdata = manifestdata + '\n@@ring_account_device { "%s:6002/%s":\n zone => %s,\n weight => 10, }'%(host, devicename, zone) manifestdata = manifestdata + '\n@@ring_account_device { "%s:6002/%s":\n zone => %s,\n weight => 10, }'%(host, devicename, zone)
@@ -171,7 +172,7 @@ def createstoragemanifest():
host = device['host'] host = device['host']
devicename = device['device_name'] devicename = device['device_name']
device = device['device'] device = device['device']
server = utils.ScriptRunner(host) server = utils.ScriptRunner(host)
validate.r_validateDevice(server, device) validate.r_validateDevice(server, device)
server.execute() server.execute()