diff --git a/README b/README index 62827bd3a..39a1bbd0b 100644 --- a/README +++ b/README @@ -17,7 +17,7 @@ $ ./bin/packstack --gen-answer-file=ans.txt # then edit ans.txt as appropriate e.g. o set CONFIG_SSH_KEY to a public ssh key to be installed to remote machines -o Edit 127.0.0.1 to anywhere you want to install a piece of openstack on another server +o Edit the IP address to anywhere you want to install a piece of openstack on another server o Edit the 3 network interfaces to whatever makes sense in your setup $ ./bin/packstack --answer-file=ans.txt diff --git a/packstack/plugins/cinder_250.py b/packstack/plugins/cinder_250.py index 8d4c051ea..b51e4104c 100644 --- a/packstack/plugins/cinder_250.py +++ b/packstack/plugins/cinder_250.py @@ -30,7 +30,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Cinder server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", diff --git a/packstack/plugins/dashboard_500.py b/packstack/plugins/dashboard_500.py index 6acc5483d..21122a3ea 100644 --- a/packstack/plugins/dashboard_500.py +++ b/packstack/plugins/dashboard_500.py @@ -31,7 +31,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Horizon server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", diff --git a/packstack/plugins/glance_200.py b/packstack/plugins/glance_200.py index 69e308367..59119d7b5 100644 --- a/packstack/plugins/glance_200.py +++ b/packstack/plugins/glance_200.py @@ -30,7 +30,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Glance server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py index f3209361e..f9ffbcfef 100644 --- a/packstack/plugins/keystone_100.py +++ b/packstack/plugins/keystone_100.py @@ -32,7 +32,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Keystone server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", diff --git a/packstack/plugins/mysql_001.py b/packstack/plugins/mysql_001.py index 8bd71c478..89301fbc6 100644 --- a/packstack/plugins/mysql_001.py +++ b/packstack/plugins/mysql_001.py @@ -31,7 +31,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the MySQL server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py index b110f2b02..9eb046192 100644 --- a/packstack/plugins/nova_300.py +++ b/packstack/plugins/nova_300.py @@ -28,7 +28,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Nova API service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", @@ -43,7 +43,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Nova Cert service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", @@ -58,7 +58,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Nova VNC proxy", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", @@ -73,7 +73,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter a comma separated list of IP addresses on which to install the Nova Compute services", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateMultiSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_NOVA_COMPUTE_HOSTS", # TO-DO: Create processor for CSV @@ -97,7 +97,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Nova Network service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", @@ -160,7 +160,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Nova Scheduler service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", diff --git a/packstack/plugins/openstack_client_400.py b/packstack/plugins/openstack_client_400.py index ec750393d..bd8dd37dc 100644 --- a/packstack/plugins/openstack_client_400.py +++ b/packstack/plugins/openstack_client_400.py @@ -30,7 +30,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the client server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", diff --git a/packstack/plugins/qpid_002.py b/packstack/plugins/qpid_002.py index 82308e2b8..73b17446e 100644 --- a/packstack/plugins/qpid_002.py +++ b/packstack/plugins/qpid_002.py @@ -30,7 +30,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the QPID service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "PROCESSOR_ARGS" : {"allow_localhost": True}, "PROCESSOR_FUNC" : process.processHost, "PROCESSOR_MSG" : "WARN_VAL_IS_HOSTNAME", diff --git a/packstack/plugins/swift_600.py b/packstack/plugins/swift_600.py index 1a20f19cd..645f25f3b 100644 --- a/packstack/plugins/swift_600.py +++ b/packstack/plugins/swift_600.py @@ -31,7 +31,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the IP address of the Swift proxy service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_SWIFT_PROXY_HOSTS", # TO-DO: Create processor for CSV @@ -43,7 +43,7 @@ def initConfig(controllerObject): "PROMPT" : "Enter the Swift Storage servers e.g. host/dev,host/dev", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateStringNotEmpty, - "DEFAULT_VALUE" : "127.0.0.1", + "DEFAULT_VALUE" : utils.getLocalhostIP(), "MASK_INPUT" : False, "LOOSE_VALIDATION": True, "CONF_NAME" : "CONFIG_SWIFT_STORAGE_HOSTS", # TO-DO: Create processor for CSV