From 13c6d1d8859932fdb654e58faa19026257639e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Boyron?= <sboyron@redhat.com>
Date: Mon, 14 Sep 2020 10:53:08 +0200
Subject: [PATCH] Update metalsmith to 1.2.0

Add ansible requirement
commit: 56066a20a476d33c8732279bed74cd8514b198e7

Move ansible role to metalsmith_ansible folder
commit: 53636ba03c89f08fe00f2b0fa24b9cba2aa5cd10

Remove unused mock requirement
commit: f6fb359cf56098297aecebdf75afa85e896278a6

Change-Id: Ia314b56ee6a07bbccd300499b135610c54a081fb
---
 openstack/metalsmith/metalsmith.spec.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openstack/metalsmith/metalsmith.spec.j2 b/openstack/metalsmith/metalsmith.spec.j2
index 7aae2754a..cb54d8532 100644
--- a/openstack/metalsmith/metalsmith.spec.j2
+++ b/openstack/metalsmith/metalsmith.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'metalsmith' %}
-{% set upstream_version = upstream_version('1.1.0') %}
+{% set upstream_version = upstream_version('1.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -11,9 +11,9 @@ License:        {{ license('Apache-2.0') }}
 Group:          Development/Languages/Python
 URL:            https://launchpad.net/{{ pypi_name }}
 Source0:        {{ source }}
+BuildRequires:  {{ py3('ansible') }}
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py3('PrettyTable') }}
-BuildRequires:  {{ py3('mock') }}
 BuildRequires:  {{ py3('openstacksdk') }}
 BuildRequires:  {{ py3('pbr') }}
 BuildRequires:  {{ py3('setuptools') }}
@@ -27,6 +27,7 @@ OpenStack Ironic.
 
 %package -n python3-metalsmith
 Summary:        Bare metal provisioner using Ironic
+Requires:       {{ py3('ansible') }}
 Requires:       {{ py3('PrettyTable') }}
 Requires:       {{ py3('openstacksdk') }}
 Requires:       {{ py3('pbr') }}
@@ -49,7 +50,6 @@ Documentation for Metalsmith
 
 %package -n ansible-role-{{ py2name() }}-deployment
 Summary:        Ansible role for Metalsmith deployment
-Requires:       ansible
 Requires:       {{ py3('metalsmith') }}
 
 %description -n ansible-role-{{ py2name() }}-deployment
@@ -85,7 +85,7 @@ python3 -m stestr.cli run
 
 %files -n ansible-role-{{ py2name() }}-deployment
 %license LICENSE
-%doc roles/metalsmith_deployment/README.rst
+%doc metalsmith_ansible/roles/metalsmith_deployment/README.rst
 %{_datadir}/ansible
 %{_datadir}/ansible/roles
 %{_datadir}/ansible/roles/metalsmith_deployment