Merge "This will make sure that tar.tz will get copied in rpm package"

Juniper · Mar 7, 2018 · f4967bd · f4967bd
2 parents 28dc1a7 + 5527a99
commit f4967bd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/rpm/contrail/contrail.spec b/rpm/contrail/contrail.spec
@@ -630,6 +630,9 @@ Requires:           python-jsonpickle
 Requires:           python-amqp
 Requires:           python-kazoo >= 1.3.1
 Requires:           python-ncclient >= 0.3.2
+Requires:           ansible >= 2.4.2
+Requires:           python2-pysnmp
+Requires:           python-swiftclient
 
 %description config
 Contrail Config package
@@ -670,6 +673,7 @@ in a NoSQL database.
 %{_bindir}/contrail-issu-post-sync
 %{_bindir}/contrail-issu-run-sync
 %{_bindir}/contrail-issu-zk-sync
+%{_fabricansible}/*.tar.gz
 %{python_sitelib}/schema_transformer*
 %{python_sitelib}/vnc_cfg_api_server*
 %{python_sitelib}/contrail_api_server*
@@ -713,7 +717,8 @@ chmod +x /etc/init.d/contrail-schema
 chmod +x /etc/init.d/contrail-device-manager
 chmod +x /etc/init.d/supervisor-config
 chmod +x /etc/init.d/contrail-config-nodemgr
-tar -xvzf %{_fabricansible}/*.tar.gz %{_fabricansible}/
+tar -xvzf %{_fabricansible}/*.tar.gz /opt/contrail/
+mv /opt/contrail/fabric_ansible_playbooks-0.1dev %{_fabricansible}
 
 %package analytics
 Summary:            Contrail Analytics