summaryrefslogtreecommitdiffstats
path: root/manifests/network/contrail/neutron_plugin.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/network/contrail/neutron_plugin.pp')
-rw-r--r--manifests/network/contrail/neutron_plugin.pp77
1 files changed, 49 insertions, 28 deletions
diff --git a/manifests/network/contrail/neutron_plugin.pp b/manifests/network/contrail/neutron_plugin.pp
index d9aa587..52cdc62 100644
--- a/manifests/network/contrail/neutron_plugin.pp
+++ b/manifests/network/contrail/neutron_plugin.pp
@@ -22,16 +22,16 @@
# String value.
# Defaults to hiera('contrail::admin_user')
#
+# [*api_server*]
+# (optional) IP address of api server
+# String value.
+# Defaults to hiera('contrail_config_vip',hiera('internal_api_virtual_ip'))
+#
# [*api_port*]
# (optional) port of api server
# String value.
# Defaults to hiera('contrail::api_port')
#
-# [*api_server*]
-# (optional) IP address of api server
-# String value.
-# Defaults to hiera('contrail_config_vip')
-#
# [*auth_host*]
# (optional) keystone server ip address
# String (IPv4) value.
@@ -42,11 +42,6 @@
# Integer value.
# Defaults to hiera('contrail::auth_port')
#
-# [*auth_port_ssl*]
-# (optional) keystone ssl port.
-# Integer value.
-# Defaults to hiera('contrail::auth_port_ssl')
-#
# [*auth_protocol*]
# (optional) authentication protocol.
# String value.
@@ -62,6 +57,14 @@
# String value.
# Defaults to hiera('contrail::service_certificate',false)
#
+# [*api_server_ip*]
+# IP address of the API Server
+# Defaults to $::os_service_default
+#
+# [*api_server_port*]
+# Port of the API Server.
+# Defaults to $::os_service_default
+#
# [*contrail_extensions*]
# Array of OpenContrail extensions to be supported
# Defaults to $::os_service_default
@@ -71,6 +74,26 @@
# contrail_extensions => ['ipam:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_ipam.NeutronPluginContrailIpam']
# }
#
+# [*keystone_auth_url*]
+# Url of the keystone auth server
+# Defaults to $::os_service_default
+#
+# [*keystone_admin_user*]
+# Admin user name
+# Defaults to $::os_service_default
+#
+# [*keystone_admin_tenant_name*]
+# Admin_tenant_name
+# Defaults to $::os_service_default
+#
+# [*keystone_admin_password*]
+# Admin password
+# Defaults to $::os_service_default
+#
+# [*keystone_admin_token*]
+# Admin token
+# Defaults to $::os_service_default
+#
# [*package_ensure*]
# (optional) Ensure state for package.
# Defaults to 'present'.
@@ -81,21 +104,20 @@
# Defaults to false.
#
class tripleo::network::contrail::neutron_plugin (
- $admin_password = hiera('contrail::admin_password'),
- $admin_tenant_name = hiera('contrail::admin_tenant_name'),
- $admin_token = hiera('contrail::admin_token'),
- $admin_user = hiera('contrail::admin_user'),
- $api_port = hiera('contrail::api_port'),
- $api_server = hiera('contrail_config_vip'),
- $auth_host = hiera('contrail::auth_host'),
- $auth_port = hiera('contrail::auth_port'),
- $auth_port_ssl = hiera('contrail::auth_port_ssl'),
- $auth_protocol = hiera('contrail::auth_protocol'),
- $ca_file = hiera('tripleo::haproxy::service_certificate',false),
- $cert_file = hiera('tripleo::haproxy::service_certificate',false),
- $contrail_extensions = hiera('contrail::vrouter::contrail_extensions'),
- $package_ensure = 'present',
- $purge_config = false,
+ $contrail_extensions = hiera('contrail::vrouter::contrail_extensions'),
+ $admin_password = hiera('contrail::admin_password'),
+ $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'),
+ $auth_host = hiera('contrail::auth_host'),
+ $auth_port = hiera('contrail::auth_port'),
+ $auth_protocol = hiera('contrail::auth_protocol'),
+ $ca_file = hiera('tripleo::haproxy::service_certificate',false),
+ $cert_file = hiera('tripleo::haproxy::service_certificate',false),
+ $purge_config = false,
+ $package_ensure = 'present',
) {
include ::neutron::deps
@@ -159,8 +181,8 @@ class tripleo::network::contrail::neutron_plugin (
command => '/usr/sbin/usermod -a -G haproxy neutron',
}
+ $auth_url = join([$auth_protocol,'://',$auth_host,':',$auth_port,'/v2.0'])
if $auth_protocol == 'https' {
- $auth_url = join([$auth_protocol,'://',$auth_host,':',$auth_port_ssl,'/v2.0'])
neutron_plugin_opencontrail {
'APISERVER/api_server_ip': value => $api_server;
'APISERVER/api_server_port': value => $api_port;
@@ -177,12 +199,11 @@ class tripleo::network::contrail::neutron_plugin (
'keystone_authtoken/admin_password': value => $admin_password, secret =>true;
'keystone_authtoken/auth_host': value => $auth_host;
'keystone_authtoken/auth_protocol': value => $auth_protocol;
- 'keystone_authtoken/auth_port': value => $auth_port_ssl;
+ 'keystone_authtoken/auth_port': value => $auth_port;
'keystone_authtoken/cafile': value => $ca_file;
'keystone_authtoken/certfile': value => $cert_file;
}
} else {
- $auth_url = join([$auth_protocol,'://',$auth_host,':',$auth_port,'/v2.0'])
neutron_plugin_opencontrail {
'APISERVER/api_server_ip': value => $api_server;
'APISERVER/api_server_port': value => $api_port;