Switch compute to use different inventory_hostname

Our role tests execute as non-root users, and the roles
need to access the environment variables for that non-root
user. Ansible, when targeting localhost, changes to
'connection: local' and thus breaks everything we need
to do against localhost as root unless we use 'become: true',
but we if generally use that against remote hosts we lose
the environment variables for the non-root user.

As such, we switch the inventory to target 'compute1' instead,
which has the address '10.1.1.1' (br-mgmt), so that we do not
have to deal with the implict connection type changes implemented
by Ansible.

Depends-On: https://review.openstack.org/584033
Change-Id: I6e6f586844f4945ebbeffe17da4cd16083d43771
This commit is contained in:
Jesse Pretorius 2018-07-19 19:02:54 +01:00
parent 783ec21ca7
commit af190195b1
3 changed files with 24 additions and 8 deletions

View File

@ -0,0 +1,21 @@
---
# Copyright 2016, 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.
ansible_host: 10.1.1.1
neutron_local_ip: 10.1.2.1
neutron_provider_networks:
network_types: "vxlan,flat"
network_mappings: "flat:eth12"
network_vxlan_ranges: "1:1000"

View File

@ -13,12 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
neutron_provider_networks:
network_types: "vxlan,flat"
network_mappings: "flat:eth12"
network_vxlan_ranges: "1:1000"
neutron_local_ip: 10.1.2.1
ansible_python_interpreter: "/usr/bin/python2"
bridges:
- name: "br-mgmt"
ip_addr: "10.1.1.1"

View File

@ -2,6 +2,7 @@
localhost
infra1
openstack1
compute1
[all_containers]
infra1
@ -47,8 +48,8 @@ openstack1
openstack1
[neutron_linuxbridge_agent]
compute1
openstack1
localhost
[neutron_openvswitch_agent]
@ -85,7 +86,7 @@ openstack1
openstack1
[nova_compute]
localhost
compute1
[nova_conductor]
openstack1