summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2016-03-10 13:29:10 -0600
committerBen Nemec <bnemec@redhat.com>2016-03-10 13:29:10 -0600
commit638a863db886ca76502df78c760d08c3457effcc (patch)
tree6e87394737d3f10df25a019d62a5c34bfef72fe4
parent2d603c051cfbf11a24a9cf2c06c103ec6664b58d (diff)
Remove mysql-dev dependency from os-svc-install
Looking through the image build logs, I noticed we were pulling in the mysql-devel packages for some reason. It turns out this is a historical artifact of the old TripleO source installs using os-svc-install. It was universally installing mysql-python on every image where it was used because that package wasn't in the requirements.txt for the OpenStack projects. This was wrong in the first place, and now that we aren't supporting that installation method anymore it doesn't make sense to keep installing nine development packages that we'll never use on our images. Note that the only thing we use from os-svc-install now appears to be os-svc-enable, so this should have no effect on the current TripleO flow, except slightly smaller/faster image builds. Change-Id: Iae3e6ae3f57de57639c4259361e82c8150fe2f0e
Notes
Notes (review): Code-Review+2: Jiri Stransky <jistr@redhat.com> Code-Review+1: Richard Su <rwsu@redhat.com> Code-Review+2: Juan Antonio Osorio Robles <jaosorior@redhat.com> Workflow+1: Juan Antonio Osorio Robles <jaosorior@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 31 Mar 2016 05:16:59 +0000 Reviewed-on: https://review.openstack.org/291385 Project: openstack/tripleo-image-elements Branch: refs/heads/master
-rwxr-xr-xelements/os-svc-install/bin/os-svc-install2
-rw-r--r--elements/os-svc-install/element-deps1
2 files changed, 0 insertions, 3 deletions
diff --git a/elements/os-svc-install/bin/os-svc-install b/elements/os-svc-install/bin/os-svc-install
index 51d7b9b..2bb79a8 100755
--- a/elements/os-svc-install/bin/os-svc-install
+++ b/elements/os-svc-install/bin/os-svc-install
@@ -53,8 +53,6 @@ function python_install() {
53 done 53 done
54 54
55 pip install -r $reqs 55 pip install -r $reqs
56 # FIXME: pip requires doesn't include MySQL-python
57 pip install MySQL-python
58 fi 56 fi
59 fi 57 fi
60 # Always replay this, as we cannot use the entry this would generate in the manifest 58 # Always replay this, as we cannot use the entry this would generate in the manifest
diff --git a/elements/os-svc-install/element-deps b/elements/os-svc-install/element-deps
index 108459b..f0a717e 100644
--- a/elements/os-svc-install/element-deps
+++ b/elements/os-svc-install/element-deps
@@ -1,4 +1,3 @@
1mysql-dev
2pip-and-virtualenv 1pip-and-virtualenv
3pip-manifest 2pip-manifest
4svc-map 3svc-map