Fix style nits in contrail manifests
There are some style nits in the recently merged contrail puppet manifests. Change-Id: Ice5935105e0323cb55e0d018190e6471ade7324a
This commit is contained in:
Carlos Camacho
parent
3e85ebb1df
commit
d3190a1318
@ -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'),
|
||||
|
||||
@ -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,
|
||||
$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' => {
|
||||
|
||||
@ -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'),
|
||||
$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),
|
||||
$purge_config = false,
|
||||
$contrail_extensions = hiera('contrail::vrouter::contrail_extensions'),
|
||||
$package_ensure = 'present',
|
||||
$purge_config = false,
|
||||
) {
|
||||
|
||||
include ::neutron::deps
|
||||
|
||||
@ -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_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'),
|
||||
$auth_host = hiera('contrail::auth_host'),
|
||||
$auth_port = hiera('contrail::auth_port'),
|
||||
$auth_protocol = hiera('contrail::auth_protocol'),
|
||||
$api_server = hiera('contrail_config_vip'),
|
||||
$step = hiera('step'),
|
||||
)
|
||||
{
|
||||
if $step >= 5 {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user