Merge "Adding proper dependency in contrail-fabric-utils package, Rem…

…oving the duplicate package installation in setup.sh"
Juniper · May 21, 2015 · bca1da7 · bca1da7
2 parents fa8c7c0 + 4f33c30
commit bca1da7
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 46 deletions.
diff --git a/build/setup.sh b/build/setup.sh
@@ -29,7 +29,9 @@ cp /opt/contrail/contrail_packages/helpers/* /opt/contrail/bin/
 yum -y --disablerepo=* remove python-crypto-2.0.1
 
 #Install basic packages 
-yum -y --disablerepo=* --enablerepo=contrail_install_repo install contrail-setup contrail-fabric-utils python-pip
+yum -y --disablerepo=* --enablerepo=contrail_install_repo install contrail-setup contrail-fabric-utils
+
+# Use pip command after installing contrail-fabric-utils
 pip install /opt/contrail/python_packages/pycrypto-*.tar.gz
 pip install /opt/contrail/python_packages/paramiko-*.tar.gz
 pip install /opt/contrail/python_packages/Fabric-*.tar.gz
diff --git a/build/setup_ubuntu.sh b/build/setup_ubuntu.sh
@@ -48,18 +48,14 @@ dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
 apt-get update
 
 #install python-software-properties and curl
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-pip
 DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-software-properties
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install curl
 
 # install base packages and fabric utils
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-crypto
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-netaddr
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-paramiko
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-fabric-utils
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-setup
 
-# install ecdsa and fabric
+#Use pip after installing contrail-fabric-utils
+# install Fabric
 pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-*.tar.gz
 
 #disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf

diff --git a/build/setup_ubuntu1404.sh b/build/setup_ubuntu1404.sh
@@ -44,17 +44,13 @@ apt-get update
 
 #install python-software-properties and curl
 DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-software-properties
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install curl
 
 # install base packages and fabric utils
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-pip
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-crypto
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-netaddr
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-paramiko
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-fabric-utils
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-setup
 
-# install ecdsa and fabric
+#Use pip after installing contrail-fabric-utils
+# install Fabric
 pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-*.tar.gz
 
 #disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf

diff --git a/build/setup_ubuntu1404_split_pkgs.sh b/build/setup_ubuntu1404_split_pkgs.sh
@@ -32,17 +32,13 @@ apt-get update
 
 #install python-software-properties and curl
 DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-software-properties
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install curl
 
 # install base packages and fabric utils
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-pip
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-crypto
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-netaddr
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-paramiko
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-fabric-utils
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-setup
 
-# install ecdsa and fabric
+#Use pip after installing contrail-fabric-utils
+# install Fabric
 pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-*.tar.gz
 
 #disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf

diff --git a/build/setup_ubuntu_juno.sh b/build/setup_ubuntu_juno.sh
@@ -47,20 +47,12 @@ cd /opt/contrail/contrail_install_repo
 dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
 apt-get update
 
-#install primitive python packages and curl
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-pip
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-pkg-resources
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-setuptools
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install curl
-
 # install base packages and fabric utils
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-crypto
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-netaddr
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-paramiko
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-fabric-utils
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-setup
 
-# install ecdsa and fabric
+#Use pip after installing contrail-fabric-utils
+# install Fabric
 pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-*.tar.gz
 
 #disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf

diff --git a/build/setup_ubuntu_juno_split_pkgs.sh b/build/setup_ubuntu_juno_split_pkgs.sh
@@ -30,20 +30,12 @@ dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
 
 apt-get update
 
-#install primitive python packages and curl
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-pip
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-pkg-resources
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-setuptools
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install curl
-
 # install base packages and fabric utils
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-crypto
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-netaddr
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-paramiko
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-fabric-utils
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-setup
 
-# install ecdsa and fabric
+#Use pip after installing contrail-fabric-utils
+# install Fabric
 pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-*.tar.gz
 
 #disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf

diff --git a/build/setup_ubuntu_split_pkgs.sh b/build/setup_ubuntu_split_pkgs.sh
@@ -31,18 +31,14 @@ dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
 apt-get update
 
 #install python-software-properties and curl
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-pip
 DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-software-properties
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install curl
 
 # install base packages and fabric utils
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-crypto
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-netaddr
-DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-paramiko
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-fabric-utils
 DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-setup
 
-# install ecdsa and fabric
+#Use pip after installing contrail-fabric-utils
+# install Fabric
 pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-*.tar.gz
 
 #disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf

diff --git a/common/debian/Makefile b/common/debian/Makefile
@@ -277,6 +277,7 @@ contrail-fabric-utils-deb:
 	$(eval BUILDDIR=${SB_TOP}/build/third_party/contrail-fabric-utils)
 	cp -R ${SB_TOP}/third_party/fabric-utils ${BUILDDIR}
 	cp -R contrail-fabric-utils/debian ${BUILDDIR}/debian
+	cp ${BUILDDIR}/debian/control.${SERIES}_${CONTRAIL_SKU} ${BUILDDIR}/debian/control
 	(cd ${BUILDDIR}; fakeroot debian/rules clean)
 	(cd ${BUILDDIR}; fakeroot debian/rules binary)
 	(mkdir -p $(SB_TOP)/build/tools/; cd ${SB_TOP}/third_party/; tar -cvzf $(SB_TOP)/build/tools/contrail-fabric-utils-$(VERSION)~$(CONTRAIL_SKU).tgz fabric-utils)

diff --git a/...bian/contrail-fabric-utils/debian/control → ...abric-utils/debian/control.precise_havana b/...bian/contrail-fabric-utils/debian/control → ...abric-utils/debian/control.precise_havana
@@ -8,7 +8,10 @@ Build-Depends: debhelper (>= 8)
 Package: contrail-fabric-utils
 Architecture: all
 Maintainer: amoghe <amoghe@juniper.net>
-Depends: python-yaml
+Depends: python-yaml,
+         python-pip,
+         python-netaddr,
+         python-paramiko (>=1.10.1)
 Section: contrail-fabric-utils
 Priority: extra
 Description: Contrail Fabric Utilities for cluster management

diff --git a/common/debian/contrail-fabric-utils/debian/control.precise_icehouse b/common/debian/contrail-fabric-utils/debian/control.precise_icehouse
@@ -0,0 +1,18 @@
+Source: contrail-fabric-utils
+Maintainer: amoghe <amoghe@juniper.net>
+Section: misc
+Priority: optional
+Standards-Version: 1.0
+Build-Depends: debhelper (>= 8)
+
+Package: contrail-fabric-utils
+Architecture: all
+Maintainer: amoghe <amoghe@juniper.net>
+Depends: python-yaml,
+         python-pip,
+         python-netaddr,
+         python-paramiko (>=1.10.1)
+Section: contrail-fabric-utils
+Priority: extra
+Description: Contrail Fabric Utilities for cluster management
+
diff --git a/common/debian/contrail-fabric-utils/debian/control.precise_juno b/common/debian/contrail-fabric-utils/debian/control.precise_juno
@@ -0,0 +1,18 @@
+Source: contrail-fabric-utils
+Maintainer: amoghe <amoghe@juniper.net>
+Section: misc
+Priority: optional
+Standards-Version: 1.0
+Build-Depends: debhelper (>= 8)
+
+Package: contrail-fabric-utils
+Architecture: all
+Maintainer: amoghe <amoghe@juniper.net>
+Depends: python-yaml,
+         python-pip,
+         python-netaddr,
+         python-paramiko (>=1.14.0)
+Section: contrail-fabric-utils
+Priority: extra
+Description: Contrail Fabric Utilities for cluster management
+
diff --git a/common/debian/contrail-fabric-utils/debian/control.trusty_icehouse b/common/debian/contrail-fabric-utils/debian/control.trusty_icehouse
@@ -0,0 +1,18 @@
+Source: contrail-fabric-utils
+Maintainer: amoghe <amoghe@juniper.net>
+Section: misc
+Priority: optional
+Standards-Version: 1.0
+Build-Depends: debhelper (>= 8)
+
+Package: contrail-fabric-utils
+Architecture: all
+Maintainer: amoghe <amoghe@juniper.net>
+Depends: python-yaml,
+         python-pip,
+         python-netaddr,
+         python-paramiko (>=1.10.1),
+Section: contrail-fabric-utils
+Priority: extra
+Description: Contrail Fabric Utilities for cluster management
+
diff --git a/common/debian/contrail-fabric-utils/debian/control.trusty_juno b/common/debian/contrail-fabric-utils/debian/control.trusty_juno
@@ -0,0 +1,19 @@
+Source: contrail-fabric-utils
+Maintainer: amoghe <amoghe@juniper.net>
+Section: misc
+Priority: optional
+Standards-Version: 1.0
+Build-Depends: debhelper (>= 8)
+
+Package: contrail-fabric-utils
+Architecture: all
+Maintainer: amoghe <amoghe@juniper.net>
+Depends: python-yaml,
+         python-pip,
+         python-netaddr,
+         python-paramiko (>=1.14.0),
+         python-ecdsa (>=0.11),
+Section: contrail-fabric-utils
+Priority: extra
+Description: Contrail Fabric Utilities for cluster management
+
diff --git a/common/rpm/fabric-utils.spec b/common/rpm/fabric-utils.spec
@@ -31,6 +31,8 @@ Contrail Fabric Utilities for cluster management
 
 BuildRequires:  systemd-units
 Requires: python-yaml
+Requires: python-netaddr
+Requires: python-pip
 
 %prep
 ## if [ ! -d contrail-fabric-utils]; then