From 1e1068cad85adccecedda66eee7715530173e32a Mon Sep 17 00:00:00 2001 From: agardner Date: Fri, 23 Feb 2018 16:13:40 -0500 Subject: Fix naming for ansible build server stuff Botched that last change Change-Id: If44039052332738a575d62c57faae95462b489a8 Signed-off-by: agardner --- utils/build-server-ansible/main.yml | 2 +- utils/build-server-ansible/vars/docker-compose-CentOS.yml | 12 ++++++++++++ utils/build-server-ansible/vars/docker-compose-Centos.yml | 12 ------------ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 utils/build-server-ansible/vars/docker-compose-CentOS.yml delete mode 100644 utils/build-server-ansible/vars/docker-compose-Centos.yml diff --git a/utils/build-server-ansible/main.yml b/utils/build-server-ansible/main.yml index c3021a4e5..0fcce715d 100644 --- a/utils/build-server-ansible/main.yml +++ b/utils/build-server-ansible/main.yml @@ -12,7 +12,7 @@ - debug: msg: "{{ inventory_hostname }} is {{ ansible_distribution }}" - include_vars: vars/defaults.yml - - include: vars/Centos.yml + - include: vars/CentOS.yml when: ansible_distribution == "CentOS" - include: vars/Ubuntu.yml when: ansible_distribution == "Ubuntu" diff --git a/utils/build-server-ansible/vars/docker-compose-CentOS.yml b/utils/build-server-ansible/vars/docker-compose-CentOS.yml new file mode 100644 index 000000000..fc4bcba7e --- /dev/null +++ b/utils/build-server-ansible/vars/docker-compose-CentOS.yml @@ -0,0 +1,12 @@ +############################################################################# +# Copyright (c) 2016 The Linux Foundation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +- name: Ensure docker compose is installed. + yum: + name: 'docker-compose' + state: present diff --git a/utils/build-server-ansible/vars/docker-compose-Centos.yml b/utils/build-server-ansible/vars/docker-compose-Centos.yml deleted file mode 100644 index fc4bcba7e..000000000 --- a/utils/build-server-ansible/vars/docker-compose-Centos.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################# -# Copyright (c) 2016 The Linux Foundation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: Ensure docker compose is installed. - yum: - name: 'docker-compose' - state: present -- cgit 1.2.3-korg