diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-09 08:28:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-09 08:28:18 +0000 |
| commit | adadb2aaa431e5ab8656e3eec46400331172d05e (patch) | |
| tree | f06b410f4ab5bca69bd7e09a68c28215da6b94fe /puppet/services | |
| parent | 6bba45ac28b166d69ed1aec1d3381cb56a4bc470 (diff) | |
| parent | b2ea349adbb18bb76188e5293a863a8bd9a9f64e (diff) | |
Merge "Move neutron's kestone::auth parameters to server profile"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/neutron-base.yaml | 1 | ||||
| -rw-r--r-- | puppet/services/neutron-server.yaml | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 3f8ac7e8..f6339c83 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -64,6 +64,5 @@ outputs: neutron::allow_overlapping_ips: true neutron::rabbit_heartbeat_timeout_threshold: 60 neutron::host: '"%{::fqdn}"' #NOTE: extra quoting is needed - neutron::keystone::auth::tenant: 'service' neutron::db::database_db_max_retries: -1 neutron::db::database_max_retries: -1 diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml index d64fd66d..a63f1857 100644 --- a/puppet/services/neutron-server.yaml +++ b/puppet/services/neutron-server.yaml @@ -33,6 +33,10 @@ parameters: description: Enable Neutron DVR. default: false type: boolean + KeystoneRegion: + type: string + default: 'regionOne' + description: Keystone region for endpoint resources: @@ -56,6 +60,12 @@ outputs: - '@' - {get_param: [EndpointMap, MysqlInternal, host]} - '/ovs_neutron' + neutron::keystone::auth::tenant: 'service' + neutron::keystone::auth::public_url: {get_param: [EndpointMap, NeutronPublic, uri]} + neutron::keystone::auth::internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] } + neutron::keystone::auth::admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] } + neutron::keystone::auth::password: {get_param: NeutronPassword} + neutron::keystone::auth::region: {get_param: KeystoneRegion} neutron::server::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } neutron::server::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} neutron::server::auth_tenant: 'service' |