diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-08-30 16:04:31 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-08-31 18:42:44 +0000 |
| commit | 98c6bdaa9916b413069b73eea8a80fa96d2e4c39 (patch) | |
| tree | c60e078a74a70a198859d403784d168142c8893b /puppet/services/neutron-api.yaml | |
| parent | e774cb35d5a0658de7595839b0c54c4181181798 (diff) | |
Last round of modern authtoken update
It updates Glance, Neutron and Swift to deploy authtoken with modern
pattern.
Change-Id: Icfaf011ea4a23bc47d2fb45e8768f8238532dab3
Diffstat (limited to 'puppet/services/neutron-api.yaml')
| -rw-r--r-- | puppet/services/neutron-api.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml index cd8a20a1..8a8c1f0b 100644 --- a/puppet/services/neutron-api.yaml +++ b/puppet/services/neutron-api.yaml @@ -79,19 +79,19 @@ outputs: 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::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } + neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} neutron::server::api_workers: {get_param: NeutronWorkers} neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} neutron::server::l3_ha: {get_param: NeutronL3HA} - neutron::server::password: {get_param: NeutronPassword} + neutron::keystone::authtoken::password: {get_param: NeutronPassword} neutron::server::notifications::nova_url: { get_param: [ EndpointMap, NovaInternal, uri ] } neutron::server::notifications::auth_url: { get_param: [ EndpointMap, KeystoneV3Admin, uri ] } neutron::server::notifications::tenant_name: 'service' neutron::server::notifications::project_name: 'service' neutron::server::notifications::password: {get_param: NovaPassword} - neutron::server::project_name: 'service' + neutron::keystone::authtoken::project_name: 'service' neutron::server::sync_db: true neutron::db::mysql::password: {get_param: NeutronPassword} neutron::db::mysql::user: neutron |