Remove credential sharing with nova
Various authtoken parameters are shifted up from the role defaults of ironic, neutron, and placement so that nova can authenticate as these services rather than itself when connecting to them as an API client. Nova's configuration has been modififed not to require credential sharing, so it will authenticate as itself to reach other APIs as a client. Depends-On: I021f85fd4d08e49876377f87a5cd2fddf54a236f Change-Id: Ibc68c6b89821e6e4905d16a9115a9e42284cb0ec
This commit is contained in:
parent
487660c79e
commit
82e853ce73
@ -1,24 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2018, Rackspace US, Inc.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
# These vars are used for ironic and nova
|
|
||||||
ironic_keystone_auth_plugin: password
|
|
||||||
ironic_service_user_name: ironic
|
|
||||||
ironic_service_project_name: service
|
|
||||||
ironic_service_proto: http
|
|
||||||
ironic_service_port: 6385
|
|
||||||
ironic_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(ironic_service_proto) }}"
|
|
||||||
ironic_service_adminuri: "{{ ironic_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ ironic_service_port }}"
|
|
||||||
ironic_service_adminurl: "{{ ironic_service_adminuri }}/v1"
|
|
@ -13,15 +13,5 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
# Referenced by nova role and must remain in 'all' group scoping
|
|
||||||
neutron_service_port: 9696
|
|
||||||
neutron_service_proto: http
|
|
||||||
neutron_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(neutron_service_proto) }}"
|
|
||||||
neutron_service_adminuri: "{{ neutron_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ neutron_service_port }}"
|
|
||||||
neutron_service_adminurl: "{{ neutron_service_adminuri }}"
|
|
||||||
neutron_service_user_name: neutron
|
|
||||||
neutron_service_project_name: service
|
|
||||||
neutron_service_region: "{{ service_region }}"
|
|
||||||
|
|
||||||
# Horizon consumes this var so it must be in the global vars namespace
|
# Horizon consumes this var so it must be in the global vars namespace
|
||||||
neutron_plugin_type: ml2.lxb
|
neutron_plugin_type: ml2.lxb
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2019, Logan Vig <logan2211@gmail.com>
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
# These vars are used for placement and nova
|
|
||||||
placement_service_project_domain_id: default
|
|
||||||
placement_service_user_domain_id: default
|
|
||||||
placement_service_user_name: placement
|
|
||||||
placement_service_project_name: service
|
|
Loading…
Reference in New Issue
Block a user