diff --git a/packstack/plugins/dashboard_500.py b/packstack/plugins/dashboard_500.py index a540ea6ba..1dea76b5f 100644 --- a/packstack/plugins/dashboard_500.py +++ b/packstack/plugins/dashboard_500.py @@ -6,6 +6,7 @@ import logging import uuid import packstack.installer.engine_validators as validate +import packstack.installer.engine_processors as process from packstack.installer import basedefs import packstack.installer.common_utils as utils @@ -31,6 +32,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validatePing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_HORIZON_HOST", diff --git a/packstack/plugins/glance_200.py b/packstack/plugins/glance_200.py index 390c50b38..e32d5ac91 100644 --- a/packstack/plugins/glance_200.py +++ b/packstack/plugins/glance_200.py @@ -5,6 +5,7 @@ Installs and configures Glance import logging import packstack.installer.engine_validators as validate +import packstack.installer.engine_processors as process from packstack.installer import basedefs import packstack.installer.common_utils as utils @@ -30,6 +31,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validatePing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_GLANCE_HOST", @@ -67,4 +71,3 @@ def createmanifest(): manifestfile = "%s_glance.pp"%controller.CONF['CONFIG_GLANCE_HOST'] manifestdata = getManifestTemplate("glance.pp") appendManifestFile(manifestfile, manifestdata) - diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py index cf6d666bd..d4d774572 100644 --- a/packstack/plugins/keystone_100.py +++ b/packstack/plugins/keystone_100.py @@ -7,6 +7,7 @@ import uuid import packstack.installer.engine_validators as validate +import packstack.installer.engine_processors as process from packstack.installer import basedefs import packstack.installer.common_utils as utils @@ -32,6 +33,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validatePing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_KEYSTONE_HOST", diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py index 91934368d..d1a6418f3 100644 --- a/packstack/plugins/nova_300.py +++ b/packstack/plugins/nova_300.py @@ -6,6 +6,7 @@ import logging import os import packstack.installer.engine_validators as validate +import packstack.installer.engine_processors as process import packstack.installer.common_utils as utils from packstack.modules.ospluginutils import NovaConfig, getManifestTemplate, appendManifestFile, manifestfiles @@ -28,6 +29,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validatePing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_NOVA_API_HOST", @@ -40,6 +44,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validatePing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_NOVA_CERT_HOST", @@ -52,6 +59,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateMultiPing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_NOVA_VNCPROXY_HOST", @@ -66,7 +76,7 @@ def initConfig(controllerObject): "DEFAULT_VALUE" : "127.0.0.1", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, - "CONF_NAME" : "CONFIG_NOVA_COMPUTE_HOSTS", + "CONF_NAME" : "CONFIG_NOVA_COMPUTE_HOSTS", # TO-DO: Create processor for CSV "USE_DEFAULT" : False, "NEED_CONFIRM" : False, "CONDITION" : False }, @@ -100,6 +110,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validatePing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_NOVA_NETWORK_HOST", @@ -160,6 +173,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validatePing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_NOVA_SCHED_HOST", diff --git a/packstack/plugins/openstack_client_400.py b/packstack/plugins/openstack_client_400.py index aaede1c5f..f008e5abc 100644 --- a/packstack/plugins/openstack_client_400.py +++ b/packstack/plugins/openstack_client_400.py @@ -5,6 +5,7 @@ Installs and configures an openstack client import logging import packstack.installer.engine_validators as validate +import packstack.installer.engine_processors as process from packstack.installer import basedefs import packstack.installer.common_utils as utils @@ -30,6 +31,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validatePing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_OSCLIENT_HOST", diff --git a/packstack/plugins/qpid_002.py b/packstack/plugins/qpid_002.py index af3872c20..c87f47edf 100644 --- a/packstack/plugins/qpid_002.py +++ b/packstack/plugins/qpid_002.py @@ -5,6 +5,7 @@ Installs and configures qpid import logging import packstack.installer.engine_validators as validate +import packstack.installer.engine_processors as process from packstack.installer import basedefs import packstack.installer.common_utils as utils @@ -30,6 +31,9 @@ def initConfig(controllerObject): "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validatePing, "DEFAULT_VALUE" : "127.0.0.1", + "PROCESSOR_ARGS" : {"allow_localhost": True}, + "PROCESSOR_FUNC" : process.processHost, + "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_QPID_HOST", diff --git a/packstack/plugins/swift_600.py b/packstack/plugins/swift_600.py index 980c43c6f..f120bc2e1 100644 --- a/packstack/plugins/swift_600.py +++ b/packstack/plugins/swift_600.py @@ -6,6 +6,7 @@ import logging import os import packstack.installer.engine_validators as validate +import packstack.installer.engine_processors as process from packstack.installer import basedefs import packstack.installer.common_utils as utils @@ -33,7 +34,7 @@ def initConfig(controllerObject): "DEFAULT_VALUE" : "127.0.0.1", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, - "CONF_NAME" : "CONFIG_SWIFT_PROXY_HOSTS", + "CONF_NAME" : "CONFIG_SWIFT_PROXY_HOSTS", # TO-DO: Create processor for CSV "USE_DEFAULT" : False, "NEED_CONFIRM" : False, "CONDITION" : False }, @@ -45,7 +46,7 @@ def initConfig(controllerObject): "DEFAULT_VALUE" : "127.0.0.1", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, - "CONF_NAME" : "CONFIG_SWIFT_STORAGE_HOSTS", + "CONF_NAME" : "CONFIG_SWIFT_STORAGE_HOSTS", # TO-DO: Create processor for CSV "USE_DEFAULT" : False, "NEED_CONFIRM" : 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)}) 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 def createbuildermanifest(): # TODO : put this on the proxy server, will need to change this later @@ -142,7 +143,7 @@ def createbuildermanifest(): host = device['host'] devicename = device['device_name'] 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_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) @@ -171,7 +172,7 @@ def createstoragemanifest(): host = device['host'] devicename = device['device_name'] device = device['device'] - + server = utils.ScriptRunner(host) validate.r_validateDevice(server, device) server.execute()