From 0b9e6b4a1a84fcda8dce09311ae682937b4b5b57 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 26 Jul 2018 10:25:36 +0100 Subject: [PATCH] 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. Change-Id: I4f582ec3edd6ccff9573d4fb5e40e6274ea38847 --- tests/host_vars/compute1.yml | 22 ++++++++++++++++++++++ tests/host_vars/localhost.yml | 8 -------- tests/inventory | 3 ++- tests/test-zun-check.yml | 4 ++-- 4 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 tests/host_vars/compute1.yml diff --git a/tests/host_vars/compute1.yml b/tests/host_vars/compute1.yml new file mode 100644 index 0000000..0654e8d --- /dev/null +++ b/tests/host_vars/compute1.yml @@ -0,0 +1,22 @@ +--- +# 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. + +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" diff --git a/tests/host_vars/localhost.yml b/tests/host_vars/localhost.yml index d1ca8e5..f88d96b 100644 --- a/tests/host_vars/localhost.yml +++ b/tests/host_vars/localhost.yml @@ -13,14 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -ansible_host: 10.1.1.1 - -neutron_provider_networks: - network_types: "vxlan,flat" - network_mappings: "flat:eth12" - network_vxlan_ranges: "1:1000" -neutron_local_ip: 10.1.2.1 - bridges: - name: "br-mgmt" ip_addr: "10.1.1.1" diff --git a/tests/inventory b/tests/inventory index a627174..48ed1dc 100644 --- a/tests/inventory +++ b/tests/inventory @@ -2,6 +2,7 @@ localhost infra1 openstack1 +compute1 [all_containers] infra1 @@ -76,7 +77,7 @@ neutron_server openstack1 [zun_compute] -localhost +compute1 [zun_all:children] zun_api diff --git a/tests/test-zun-check.yml b/tests/test-zun-check.yml index 28a8188..5ddba10 100644 --- a/tests/test-zun-check.yml +++ b/tests/test-zun-check.yml @@ -15,7 +15,7 @@ - name: Create a zun image hosts: zun_compute - become: true + remote_user: root tasks: - name: Pull cirros image command: docker pull cirros @@ -33,7 +33,7 @@ - name: Run zun service check hosts: zun_api[0] - become: true + remote_user: root tasks: - name: Check zun service is functional shell: |