summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-27 20:01:27 +0000
committerGerrit Code Review <review@openstack.org>2015-05-27 20:01:27 +0000
commit593e3dc530058a4a0fb6b03ed32e7792883a5590 (patch)
tree800d7df3e69fc2b3293e60a97a21b992d7cffdae
parent187b0413fb282a1deb2008e6bf50ae6031c9bb02 (diff)
parent8072ae85082dd060d1cb8e3bcba76da8372ed593 (diff)
Merge "Map Keystone services to isolated networks"
-rw-r--r--overcloud-resource-registry-puppet.yaml2
-rw-r--r--puppet/controller-puppet.yaml4
2 files changed, 4 insertions, 2 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 1967646c..db556e80 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -72,3 +72,5 @@ parameter_defaults:
CinderIscsiNetwork: storage
GlanceApiNetwork: storage
GlanceRegistryNetwork: internal_api
+ KeystoneAdminApiNetwork: internal_api
+ KeystonePublicApiNetwork: external
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 5cb57a73..3437c291 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -810,8 +810,8 @@ resources:
keystone_ssl_certificate: {get_input: keystone_ssl_certificate}
keystone_ssl_certificate_key: {get_input: keystone_ssl_certificate_key}
keystone::database_connection: {get_input: keystone_dsn}
- keystone::public_bind_host: {get_input: controller_host}
- keystone::admin_bind_host: {get_input: controller_host}
+ keystone::public_bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
+ keystone::admin_bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
keystone::debug: {get_input: debug}
# MongoDB
mongodb::server::bind_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}