Merge "Remove hardcoded dev values from config.yaml"

This commit is contained in:
Jenkins 2016-09-30 23:47:07 +00:00 committed by Gerrit Code Review
commit f0e6234d12
2 changed files with 4 additions and 2 deletions

View File

@ -41,7 +41,7 @@ options:
description: "neutron network"
swift-resource-ip:
type: string
default: "10.245.160.50"
default:
description: "undercloud swift ip"
cidr-priv:
type: string
@ -49,7 +49,7 @@ options:
description: "cidr priv"
name-server:
type: string
default: "10.245.160.2"
default:
description: "name server"
http-proxy:
type: string

View File

@ -58,7 +58,9 @@ http_image = http://{{ options.swift_undercloud_ep }}:80/swift/v1/images/cirros-
[network]
tenant_network_cidr={{ options.cidr_priv }}
public_network_id={{ identity_admin.network_info.public_network_id }}
{% if options.name_server -%}
dns_servers={{ options.name_server }}
{% endif -%}
tenant_networks_reachable = false
[network-feature-enabled]
ipv6=false