openstack
/
instack-undercloud
Code Issues Proposed changes

Explicitly configure credentials used by ironic to access neutron and swift 

Using keystone_authtoken credentials for this purpose is deprecated.

Also stop setting neutron API URL explicitly for it to be fetched
from the service catalog instead.

Also add missing manifest includes (all except for swift are already included
implicitly for backward compatibility in puppet-ironic).

Change-Id: I89ed5709cb3110848c5185d3596dfd9eaed823e2
Partial-Bug: #1661250
This commit is contained in:
Dmitry Tantsur 2017-02-03 11:31:46 +01:00
parent 92ead4145e
commit 03a42f1583
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -465,8 +465,11 @@ include ::ironic::drivers::ilo
include ::ironic::drivers::ipmi
include ::ironic::drivers::pxe
include ::ironic::drivers::ssh
include ::ironic::glance
include ::ironic::inspector
include ::ironic::neutron
include ::ironic::pxe
include ::ironic::swift
include ::ironic::cors
Keystone_endpoint<||> -> Service['ironic-api']

7
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -442,13 +442,16 @@ ironic::rpc_response_timeout: 600
ironic::api::authtoken::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
ironic::api::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
ironic::api::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"
ironic::api::neutron_url: {{UNDERCLOUD_ENDPOINT_NEUTRON_PUBLIC}}
ironic::api::host_ip: {{LOCAL_IP}}
ironic::api::workers: "%{::os_workers}"
ironic::database_connection: mysql+pymysql://ironic:{{UNDERCLOUD_IRONIC_PASSWORD}}@{{LOCAL_IP}}/ironic
ironic::default_transport_url: "rabbit://{{UNDERCLOUD_RABBIT_USERNAME}}:{{UNDERCLOUD_RABBIT_PASSWORD}}@{{LOCAL_IP}}//"
ironic::glance::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
ironic::glance::auth_url: "%{hiera('keystone_identity_uri')}"
ironic::neutron::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
ironic::neutron::auth_url: "%{hiera('keystone_identity_uri')}"
ironic::swift::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
ironic::swift::auth_url: "%{hiera('keystone_identity_uri')}"
# Ironic conductor forces deployments to use http
# https://bugs.launchpad.net/tripleo/+bug/1613088
ironic::conductor::api_url: {{UNDERCLOUD_ENDPOINT_IRONIC_INTERNAL}}
@ -708,6 +711,8 @@ glance::api::authtoken::project_name: 'service'
glance::registry::authtoken::project_name: 'service'
ironic::api::authtoken::project_name: 'service'
ironic::glance::project_name: 'service'
ironic::neutron::project_name: 'service'
ironic::swift::project_name: 'service'
nova::keystone::authtoken::project_name: 'service'
swift::proxy::authtoken::project_name: 'service'
mistral::keystone_tenant: 'service'