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: I79256f9cb542732cfdff6439768f94769ee33b1c
This commit is contained in:
parent
c2a337ecfd
commit
fea608bbf7
|
@ -0,0 +1,17 @@
|
||||||
|
---
|
||||||
|
# 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
|
|
@ -13,9 +13,6 @@
|
||||||
# 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.
|
||||||
|
|
||||||
ansible_host: 127.0.0.1
|
|
||||||
neutron_local_ip: 10.1.2.1
|
|
||||||
ansible_python_interpreter: "/usr/bin/python2"
|
|
||||||
bridges:
|
bridges:
|
||||||
- name: "br-mgmt"
|
- name: "br-mgmt"
|
||||||
ip_addr: "10.1.1.1"
|
ip_addr: "10.1.1.1"
|
||||||
|
|
|
@ -3,6 +3,7 @@ localhost
|
||||||
infra1
|
infra1
|
||||||
openstack1
|
openstack1
|
||||||
tempest1
|
tempest1
|
||||||
|
compute1
|
||||||
|
|
||||||
[all_containers]
|
[all_containers]
|
||||||
infra1
|
infra1
|
||||||
|
@ -44,7 +45,7 @@ openstack1
|
||||||
|
|
||||||
[neutron_linuxbridge_agent]
|
[neutron_linuxbridge_agent]
|
||||||
openstack1
|
openstack1
|
||||||
localhost
|
compute1
|
||||||
|
|
||||||
[neutron_openvswitch_agent]
|
[neutron_openvswitch_agent]
|
||||||
|
|
||||||
|
@ -87,7 +88,7 @@ openstack1
|
||||||
openstack1
|
openstack1
|
||||||
|
|
||||||
[nova_compute]
|
[nova_compute]
|
||||||
localhost
|
compute1
|
||||||
|
|
||||||
[nova_conductor]
|
[nova_conductor]
|
||||||
openstack1
|
openstack1
|
||||||
|
|
Loading…
Reference in New Issue