diff --git a/inventory/group_vars/all/ironic.yml b/inventory/group_vars/all/ironic.yml deleted file mode 100644 index cba7d8cde8..0000000000 --- a/inventory/group_vars/all/ironic.yml +++ /dev/null @@ -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" diff --git a/inventory/group_vars/all/neutron.yml b/inventory/group_vars/all/neutron.yml index d85f257ae0..c7957d6194 100644 --- a/inventory/group_vars/all/neutron.yml +++ b/inventory/group_vars/all/neutron.yml @@ -13,15 +13,5 @@ # See the License for the specific language governing permissions and # 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 neutron_plugin_type: ml2.lxb diff --git a/inventory/group_vars/all/placement.yml b/inventory/group_vars/all/placement.yml deleted file mode 100644 index ae1ea1134d..0000000000 --- a/inventory/group_vars/all/placement.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Copyright 2019, Logan Vig -# -# 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