diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-08 06:13:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-08 06:13:27 +0000 |
| commit | 0b63b64d051df5241ea8a6de733fb418ef66498a (patch) | |
| tree | 4da1f81b82b74edc235602fa3c2c310b47497c05 | |
| parent | 52526b580387549aa7323112195bac8dcacfc178 (diff) | |
| parent | 4a2ef1f21d527f80fc05759b96ce606ced5c5898 (diff) | |
| download | kolla-0b63b64d051df5241ea8a6de733fb418ef66498a.tar.gz kolla-0b63b64d051df5241ea8a6de733fb418ef66498a.zip | |
Merge "Set curl as the default source install method"
| -rw-r--r-- | docker/centos/source/cinder-app/cinder-base/.buildinfo | 1 | ||||
| -rw-r--r-- | docker/centos/source/neutron/neutron-base/.buildinfo | 1 | ||||
| -rw-r--r-- | docker/centos/source/nova/nova-base/.buildinfo | 1 | ||||
| -rw-r--r-- | tools/gen-source-tar.sh | 2 |
4 files changed, 1 insertions, 4 deletions
diff --git a/docker/centos/source/cinder-app/cinder-base/.buildinfo b/docker/centos/source/cinder-app/cinder-base/.buildinfo index af451be2b..05cb8abab 100644 --- a/docker/centos/source/cinder-app/cinder-base/.buildinfo +++ b/docker/centos/source/cinder-app/cinder-base/.buildinfo @@ -2,7 +2,6 @@ COMPONENT=cinder SOURCE_INSTALL_AVAILABLE=1 -SOURCE_INSTALL_METHOD=curl # Used for git install method : ${CLONE_FROM:=https://github.com/openstack/cinder} diff --git a/docker/centos/source/neutron/neutron-base/.buildinfo b/docker/centos/source/neutron/neutron-base/.buildinfo index 513c257b6..b4035affb 100644 --- a/docker/centos/source/neutron/neutron-base/.buildinfo +++ b/docker/centos/source/neutron/neutron-base/.buildinfo @@ -1,6 +1,5 @@ # Build info specific to this image. All values can be overridden in .buildconf -SOURCE_INSTALL_METHOD=curl COMPONENT=neutron SOURCE_INSTALL_AVAILABLE=1 diff --git a/docker/centos/source/nova/nova-base/.buildinfo b/docker/centos/source/nova/nova-base/.buildinfo index 73722fcb9..2c5f3d813 100644 --- a/docker/centos/source/nova/nova-base/.buildinfo +++ b/docker/centos/source/nova/nova-base/.buildinfo @@ -1,6 +1,5 @@ # Build info specific to this image. All values can be overridden in .buildconf -SOURCE_INSTALL_METHOD=curl COMPONENT=nova SOURCE_INSTALL_AVAILABLE=1 diff --git a/tools/gen-source-tar.sh b/tools/gen-source-tar.sh index c7658d3d2..6f3a6eb20 100644 --- a/tools/gen-source-tar.sh +++ b/tools/gen-source-tar.sh @@ -2,7 +2,7 @@ set -e -: ${SOURCE_INSTALL_METHOD:=git} +: ${SOURCE_INSTALL_METHOD:=curl} : ${GIT_REF:=master} : ${LOCAL_SOURCE:=/tmp/${COMPONENT}} |