summaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-08-29 22:25:10 -0400
committerTim Rozet <trozet@redhat.com>2017-08-29 22:37:33 -0400
commit3483b1077086ec5773ffafdf7304d127f30e6d62 (patch)
tree62267e77cd14265a9627bdf1125a67d204865b40 /build/Makefile
parent15d8c6b0dff0153a5d106d827442e65fe4c9b559 (diff)
Fixes missing iso packages and idempotency of virt resources
Python packages for ansible (py2.x) were missing causing ansible to fail. This patch adds those packages to the ISO and deploy dependencies playbook. Also includes fixes for deploy_dependencies playbook for virt resources to make them idempotent by removing using 'command' and instead just declaring 'state'. Change-Id: I9311184a6f3c40ead0a8ba16fa0b61667876cf12 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile
index 7cc8736e..5f078339 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -271,7 +271,11 @@ iso: iso-clean images rpms $(CENTISO)
@ln $(RPMUDR) $(BUILD_DIR)/centos/Packages
@ln $(RPMODL) $(BUILD_DIR)/centos/Packages
# add packages to the centos packages
- cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe ansible python34-six python34-cffi python34-idna python34-pycparser python-crypto python-httplib2 python-jinja2 python-keyczar python-paramiko sshpass python-ecdsa python34-ply
+ cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools
+ cd $(BUILD_DIR)/centos/Packages && yumdownloader python34-jinja2 python34-markupsafe ansible python34-six python34-cffi
+ cd $(BUILD_DIR)/centos/Packages && yumdownloader ipxe-roms-qemu python34-idna python34-pycparser python-crypto python-httplib2
+ cd $(BUILD_DIR)/centos/Packages && yumdownloader python-jinja2 python-keyczar python-paramiko sshpass python-ecdsa python34-ply
+ cd $(BUILD_DIR)/centos/Packages && yumdownloader libvirt-python python-lxml
cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm
cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-asn1crypto-0.22.0-1.el7.centos.noarch.rpm
cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-cryptography-2.0.3-1.el7.centos.x86_64.rpm