From 7fbe3118568e3fedb92027b54972100dcb9eab66 Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Aug 09 2017 16:39:19 +0000
Subject: Sync with upstream release 2.3

Adds merge-standard-inventory

---

diff --git a/.gitignore b/.gitignore
index 52d3aa4..7d6d250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /standard-test-roles-1.0.tar.gz
 /standard-test-roles-2.0.tar.gz
 /standard-test-roles-2.1.tar.gz
+/standard-test-roles-2.2.tar.gz
+/standard-test-roles-2.3.tar.gz
diff --git a/sources b/sources
index 4c33c05..5b85f62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (standard-test-roles-2.1.tar.gz) = df7d3b41de38b7d17b1ab0668da37a3132c971da748caea99d90954f95aad04a6137c7aa1d53ab55d88c4b2ca01efb64fe493116d9e8c6ebd5b352a47cc68402
+SHA512 (standard-test-roles-2.3.tar.gz) = 178cb599c52337227239f12e389376c9220bbe828d8b578ee14d4bd1ce4a0fa728314146aa9f21f12e2441d33d2426e8092afb216fdfe6f96fb34c590d24cd1f
diff --git a/standard-test-roles.spec b/standard-test-roles.spec
index 86fcaf3..0d64e8f 100644
--- a/standard-test-roles.spec
+++ b/standard-test-roles.spec
@@ -1,5 +1,5 @@
 Name:          standard-test-roles
-Version:       2.1
+Version:       2.3
 Release:       1%{?dist}
 Summary:       Standard Test Interface Ansible roles
 
@@ -37,6 +37,9 @@ at %{url}.
 mkdir -p %{buildroot}%{_sysconfdir}/ansible/roles
 cp -pr roles/* %{buildroot}%{_sysconfdir}/ansible/roles/
 
+mkdir -p %{buildroot}/%{_bindir}
+install -p -m 0755 scripts/merge-standard-inventory %{buildroot}/%{_bindir}/merge-standard-inventory
+
 mkdir -p %{buildroot}%{_datadir}/ansible/inventory
 cp -p inventory/* %{buildroot}%{_datadir}/ansible/inventory/
 
@@ -45,10 +48,15 @@ cp -p inventory/* %{buildroot}%{_datadir}/ansible/inventory/
 %license LICENSE
 %doc README.md
 %config %{_sysconfdir}/ansible/roles/*
+%{_bindir}/merge-standard-inventory
 %{_datadir}/ansible/inventory/*
 
 
 %changelog
+* Wed Aug 09 2017 Merlin Mathesius <mmathesi@redhat.com> - 2.3-1
+- Sync with upstream release 2.3
+- Adds merge-standard-inventory
+
 * Fri Jul 28 2017 Merlin Mathesius <mmathesi@redhat.com> - 2.1-1
 - Sync with upstream release 2.1
 - Add package dependencies for docker, genisoimage, and qemu-system-x86