aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/network/contrail/database.pp14
-rw-r--r--manifests/network/contrail/heat.pp30
-rw-r--r--manifests/network/contrail/neutron_plugin.pp68
-rw-r--r--manifests/network/contrail/provision.pp20
4 files changed, 47 insertions, 85 deletions
diff --git a/manifests/network/contrail/database.pp b/manifests/network/contrail/database.pp
index 9786d8f..f74eb1c 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')
-#
# [*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.
@@ -104,13 +104,12 @@
# Defaults to hiera('contrail_database_node_ips')
#
class tripleo::network::contrail::database(
- $step = hiera('step'),
$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'),
$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'),
@@ -118,6 +117,7 @@ class tripleo::network::contrail::database(
$host_ip = hiera('contrail::database::host_ip'),
$host_name = $::hostname,
$public_vip = hiera('public_virtual_ip'),
+ $step = hiera('step'),
$zookeeper_client_ip = hiera('contrail::database::host_ip'),
$zookeeper_hostnames = hiera('contrail_database_short_node_names'),
$zookeeper_server_ips = hiera('contrail_database_node_ips'),
diff --git a/manifests/network/contrail/heat.pp b/manifests/network/contrail/heat.pp
index c8998c9..637fdda 100644
--- a/manifests/network/contrail/heat.pp
+++ b/manifests/network/contrail/heat.pp
@@ -24,26 +24,21 @@
# String value.
# Defaults to hiera('contrail::admin_password')
#
-# [*admin_tenant_name*]
-# (optional) admin tenant name.
-# String value.
-# Defaults to hiera('contrail::admin_tenant_name')
-#
# [*admin_user*]
# (optional) admin user name.
# String value.
# Defaults to hiera('contrail::admin_user')
#
-# [*api_server*]
-# (optional) IP address of api server
-# String value.
-# Defaults to hiera('contrail_config_vip')
-#
# [*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.
@@ -60,16 +55,15 @@
# Defaults to 'False'
#
class tripleo::network::contrail::heat(
- $step = hiera('step'),
- $admin_password = hiera('contrail::admin_password'),
- $admin_user = hiera('contrail::admin_user'),
- $api_server = hiera('contrail_config_vip'),
- $api_port = 8082,
- $auth_host = hiera('contrail::auth_host'),
- $use_ssl = 'False',
+ $admin_password = hiera('contrail::admin_password'),
+ $admin_user = hiera('contrail::admin_user'),
+ $api_port = 8082,
+ $api_server = hiera('contrail_config_vip'),
+ $auth_host = hiera('contrail::auth_host'),
+ $step = hiera('step'),
+ $use_ssl = 'False',
)
{
-
class {'::contrail::heat':
heat_config => {
'clients_contrail' => {
diff --git a/manifests/network/contrail/neutron_plugin.pp b/manifests/network/contrail/neutron_plugin.pp
index a0d2b96..d9aa587 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')
-#
# [*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.
@@ -62,14 +62,6 @@
# 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
@@ -79,26 +71,6 @@
# 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'.
@@ -109,21 +81,21 @@
# Defaults to false.
#
class tripleo::network::contrail::neutron_plugin (
- $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'),
- $api_port = hiera('contrail::api_port'),
- $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),
- $purge_config = false,
- $package_ensure = 'present',
+ $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,
) {
include ::neutron::deps
diff --git a/manifests/network/contrail/provision.pp b/manifests/network/contrail/provision.pp
index d1c6d0d..3025737 100644
--- a/manifests/network/contrail/provision.pp
+++ b/manifests/network/contrail/provision.pp
@@ -19,10 +19,6 @@
#
# == Parameters:
#
-# [*host_ip*]
-# (required) host IP address of Control
-# String (IPv4) value.
-#
# [*admin_password*]
# (optional) admin password
# String value.
@@ -67,15 +63,15 @@
# Defaults to hiera('step')
#
class tripleo::network::contrail::provision(
- $step = hiera('step'),
- $admin_password = hiera('contrail::admin_password'),
+ $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'),
- $auth_host = hiera('contrail::auth_host'),
- $auth_port = hiera('contrail::auth_port'),
- $auth_protocol = hiera('contrail::auth_protocol'),
- $api_server = hiera('contrail_config_vip'),
+ $admin_token = hiera('contrail::admin_token'),
+ $admin_user = hiera('contrail::admin_user'),
+ $api_server = hiera('contrail_config_vip'),
+ $auth_host = hiera('contrail::auth_host'),
+ $auth_port = hiera('contrail::auth_port'),
+ $auth_protocol = hiera('contrail::auth_protocol'),
+ $step = hiera('step'),
)
{
if $step >= 5 {