summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-13 08:51:01 +0000
committerGerrit Code Review <review@openstack.org>2014-10-13 08:51:01 +0000
commitb986ac098a4dffbbda33fdb6e2d46056c1c39c90 (patch)
tree10f0597bdac8c3d70250e885bbaf9e103d3bfe0d
parent42328f1e0ca9ff07279ae8e2606532cebe5e6311 (diff)
parent53172219c4fcf58b9797359a72f662ade058ea31 (diff)
downloadtuskar-ui-b986ac098a4dffbbda33fdb6e2d46056c1c39c90.tar.gz
Merge "Neutron config should be defaulted for baremetal"
-rw-r--r--tuskar_ui/infrastructure/overview/forms.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tuskar_ui/infrastructure/overview/forms.py b/tuskar_ui/infrastructure/overview/forms.py
index 62a2542f..d42e8d58 100644
--- a/tuskar_ui/infrastructure/overview/forms.py
+++ b/tuskar_ui/infrastructure/overview/forms.py
@@ -227,15 +227,15 @@ class PostDeployInit(horizon.forms.SelfHandlingForm):
float_allocation_start = horizon.forms.CharField(
label=_("Float Allocation Start"), initial="10.0.0.2")
float_allocation_end = horizon.forms.CharField(
- label=_("Float Allocation Start"), initial="10.255.255.254")
+ label=_("Float Allocation End"), initial="10.255.255.254")
float_cidr = horizon.forms.CharField(
label=_("Float CIDR"), initial="10.0.0.0/8")
external_allocation_start = horizon.forms.CharField(
- label=_("External Allocation Start"), initial="192.0.2.45")
+ label=_("External Allocation Start"), initial="172.17.0.45")
external_allocation_end = horizon.forms.CharField(
- label=_("External Allocation Start"), initial="192.0.2.64")
+ label=_("External Allocation End"), initial="172.17.0.64")
external_cidr = horizon.forms.CharField(
- label=_("External CIDR"), initial="192.0.2.0/24")
+ label=_("External CIDR"), initial="172.17.0.0/16")
def build_endpoints(self, plan, controller_role):
return {