diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-03 00:58:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-03 00:58:51 +0000 |
| commit | d25ce80faa70a442a82b028723ac5829569f0f53 (patch) | |
| tree | 4543426de8b1323a2ef428ac3784b99e37eef976 /manifests/network/contrail/provision.pp | |
| parent | 3f7e74ab24bb43f9ad7e24e0efd4206ac6a3dd4e (diff) | |
| parent | d3190a13189ff8fb2abc5e9c7b996034b4363c9b (diff) | |
Merge "Fix style nits in contrail manifests"
Diffstat (limited to 'manifests/network/contrail/provision.pp')
| -rw-r--r-- | manifests/network/contrail/provision.pp | 20 |
1 files changed, 8 insertions, 12 deletions
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 { |