diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-17 11:08:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-17 11:08:15 +0000 |
| commit | 0b2829480a299dcba6d5471a99ed76fb92ca31a6 (patch) | |
| tree | 79b5c86adf57aca8025bcc325f7c4d070b5a1718 /puppet/services/ironic-api.yaml | |
| parent | 5c609f7c78bee71985120cd15ffbe2d6f2d548a4 (diff) | |
| parent | 71dc47ef66c433cb90912cf96a4e8df7e3b04117 (diff) | |
Merge "Update Ironic composable services"
Diffstat (limited to 'puppet/services/ironic-api.yaml')
| -rw-r--r-- | puppet/services/ironic-api.yaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml index 949cdf31..a85c0c55 100644 --- a/puppet/services/ironic-api.yaml +++ b/puppet/services/ironic-api.yaml @@ -35,9 +35,18 @@ outputs: # the VIP, but rather a real IP of the controller. - ironic::my_ip: {get_param: [EndpointMap, MysqlInternal, host]} ironic::api::admin_password: {get_param: IronicPassword} - ironic::keystone::auth::public_url: {get_param: [EndpointMap, IronicPublic, uri]} - ironic::keystone::auth::internal_url: {get_param: [EndpointMap, IronicInternal, uri]} + ironic::api::admin_tenant_name: 'service' + ironic::api::admin_user: 'ironic' + ironic::api::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } + ironic::api::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} + ironic::api::port: {get_param: [EndpointMap, IronicInternal, port]} + # This is used to build links in responses + ironic::api::public_endpoint: {get_param: [EndpointMap, IronicPublic, uri_no_suffix]} ironic::keystone::auth::admin_url: {get_param: [EndpointMap, IronicAdmin, uri]} + ironic::keystone::auth::internal_url: {get_param: [EndpointMap, IronicInternal, uri]} + ironic::keystone::auth::public_url: {get_param: [EndpointMap, IronicPublic, uri]} + ironic::keystone::auth::auth_name: 'ironic' ironic::keystone::auth::password: {get_param: IronicPassword } + ironic::keystone::auth::tenant: 'service' step_config: | include ::tripleo::profile::base::ironic::api |