diff options
Diffstat (limited to 'manifests/network/contrail/database.pp')
| -rw-r--r-- | manifests/network/contrail/database.pp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/manifests/network/contrail/database.pp b/manifests/network/contrail/database.pp index 3d6b40b..35ac9cd 100644 --- a/manifests/network/contrail/database.pp +++ b/manifests/network/contrail/database.pp @@ -39,16 +39,16 @@ # String value. # Defaults to hiera('contrail::admin_user') # +# [*api_server*] +# (optional) VIP of Config API +# String (IPv4) value. +# Defaults to hiera('contrail_config_vip',hiera('internal_api_virtual_ip')) +# # [*api_port*] # (optional) Port of Config API # String value. # Defaults to hiera('contrail::api_port') # -# [*api_server*] -# (optional) VIP of Config API -# String (IPv4) value. -# Defaults to hiera('contrail_config_vip') -# # [*auth_host*] # (optional) keystone server ip address # String (IPv4) value. @@ -62,7 +62,7 @@ # [*disc_server_ip*] # (optional) IPv4 address of discovery server. # String (IPv4) value. -# Defaults to hiera('contrail_config_vip'), +# Defaults to hiera('contrail::disc_server_ip') # # [*disc_server_port*] # (optional) port Discovery server listens on. @@ -78,10 +78,10 @@ # String value. # Defaults to $::hostname # -# [*public_vip*] +# [*internal_vip*] # (optional) Public virtual ip # String value. -# Defaults to hiera('public_virtual_ip') +# Defaults to hiera('internal_api_virtual_ip') # # [*step*] # (optional) Step stack is in @@ -108,15 +108,15 @@ class tripleo::network::contrail::database( $admin_tenant_name = hiera('contrail::admin_tenant_name'), $admin_token = hiera('contrail::admin_token'), $admin_user = hiera('contrail::admin_user'), + $api_server = hiera('contrail_config_vip',hiera('internal_api_virtual_ip')), $api_port = hiera('contrail::api_port'), - $api_server = hiera('contrail_config_vip'), $auth_host = hiera('contrail::auth_host'), $cassandra_servers = hiera('contrail_database_node_ips'), - $disc_server_ip = hiera('contrail_config_vip'), + $disc_server_ip = hiera('contrail_config_vip',hiera('internal_api_virtual_ip')), $disc_server_port = hiera('contrail::disc_server_port'), $host_ip = hiera('contrail::database::host_ip'), $host_name = $::hostname, - $public_vip = hiera('public_virtual_ip'), + $internal_vip = hiera('internal_api_virtual_ip'), $step = Integer(hiera('step')), $zookeeper_client_ip = hiera('contrail::database::host_ip'), $zookeeper_hostnames = hiera('contrail_database_short_node_names'), @@ -160,7 +160,7 @@ class tripleo::network::contrail::database( keystone_admin_user => $admin_user, keystone_admin_password => $admin_password, keystone_admin_tenant_name => $admin_tenant_name, - openstack_vip => $public_vip, + openstack_vip => $auth_host, } } } |