From cd8b38a4b0b671714e3d6963af810542de5edba2 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Wed, 19 Apr 2017 17:26:15 -0700 Subject: [PATCH] Standardize test vars Move test host vars from the inventory to individual files for each host. 'ansible_become' has been removed from localhost's vars since it should be handled on a playbook basis. Change-Id: Iff5a80b21d781b73e64a52e7becce08aeaefb92c --- tests/host_vars/infra1.yml | 18 ++++++++++++++++++ tests/host_vars/openstack1.yml | 18 ++++++++++++++++++ tests/host_vars/openstack2.yml | 18 ++++++++++++++++++ tests/inventory | 8 ++++---- 4 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 tests/host_vars/infra1.yml create mode 100644 tests/host_vars/openstack1.yml create mode 100644 tests/host_vars/openstack2.yml diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml new file mode 100644 index 0000000..86d45ff --- /dev/null +++ b/tests/host_vars/infra1.yml @@ -0,0 +1,18 @@ +--- +# 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.0.2 +ansible_become: True +ansible_user: root diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml new file mode 100644 index 0000000..23b9498 --- /dev/null +++ b/tests/host_vars/openstack1.yml @@ -0,0 +1,18 @@ +--- +# 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.0.3 +ansible_become: True +ansible_user: root diff --git a/tests/host_vars/openstack2.yml b/tests/host_vars/openstack2.yml new file mode 100644 index 0000000..0e876f6 --- /dev/null +++ b/tests/host_vars/openstack2.yml @@ -0,0 +1,18 @@ +--- +# 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.0.4 +ansible_become: True +ansible_user: root diff --git a/tests/inventory b/tests/inventory index b0c1189..7787b40 100644 --- a/tests/inventory +++ b/tests/inventory @@ -1,8 +1,8 @@ [all] -localhost ansible_become=True -infra1 ansible_host=10.1.0.2 ansible_become=True ansible_user=root -openstack1 ansible_host=10.1.0.3 ansible_become=True ansible_user=root -openstack2 ansible_host=10.1.0.4 ansible_become=True ansible_user=root +localhost +infra1 +openstack1 +openstack2 [all_containers] infra1