From 00214a8cf06840cf5be6427d3c8d0ba84a7a1069 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Fri, 19 Aug 2016 04:05:36 +0000 Subject: Revert "Prepare the jump host offline" This reverts commit b7058b4b3f823cf4c95c38741dddc68b59b733cc. Change-Id: I77437a15a0a0c47f768de30eaf7f37cf73f028fb Signed-off-by: Yifei Xue --- build/build.conf | 1 - build/jhenv_template/centos/rhel7/Dockerfile | 54 -------------------------- build/jhenv_template/ubuntu/trusty/Dockerfile | 35 ----------------- build/jhenv_template/ubuntu/xenial/Dockerfile | 35 ----------------- build/make_repo.sh | 55 +-------------------------- 5 files changed, 1 insertion(+), 179 deletions(-) delete mode 100644 build/jhenv_template/centos/rhel7/Dockerfile delete mode 100644 build/jhenv_template/ubuntu/trusty/Dockerfile delete mode 100644 build/jhenv_template/ubuntu/xenial/Dockerfile (limited to 'build') diff --git a/build/build.conf b/build/build.conf index 0723064f..c6e0f7a1 100644 --- a/build/build.conf +++ b/build/build.conf @@ -14,7 +14,6 @@ export COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-instal # Compass core packages export COMPASS_PKG=${COMPASS_PKG:-$PACKAGE_URL/centos7-compass-core.tar.gz} export PIP_REPO=${PIP_REPO:-$PACKAGE_URL/pip.tar.gz} -export JH_ENV_PACKAGE=${JH_ENV_PACKAGE:-$PACKAGE_URL/jh_env_package.tar.gz} export ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/openstack-ansible-modules.git} # OS ISO for provisioning diff --git a/build/jhenv_template/centos/rhel7/Dockerfile b/build/jhenv_template/centos/rhel7/Dockerfile deleted file mode 100644 index a47360aa..00000000 --- a/build/jhenv_template/centos/rhel7/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -FROM centos:7.1.1503 -MAINTAINER Yifei Xue - -ADD ./cp_env.sh /cp_env.sh - -#RUN yum provides '*/applydeltarpm' -y - -#RUN yum install deltarpm -y - -RUN yum remove -y systemd - -RUN yum update -y - -RUN yum install yum-plugin-downloadonly - -RUN mkdir -p /rpm - -RUN yum install -y epel-release-7-8 - -RUN yum groupinstall -y --downloadonly --downloaddir=/rpm 'Development Tools' - -RUN yum install -y --downloadonly --downloaddir=/rpm epel-release mkisofs bc curl ipmitool \ -git python-pip python-devel figlet \ -libxslt-devel libxml2-devel libvirt-devel \ -qemu qemu-kvm qemu-img virt-manager libvirt libvirt-python libvirt-client virt-install virt-viewer \ -guestfish libguestfs-tools virt-top mysql-devel \ -openssl-devel libffi libffi-devel python-cffi - -RUN yum install -y epel-release mkisofs bc curl ipmitool \ -git python-pip python-devel figlet \ -libxslt-devel libxml2-devel libvirt-devel \ -qemu qemu-kvm qemu-img virt-manager libvirt libvirt-python libvirt-client virt-install virt-viewer \ -guestfish libguestfs-tools virt-top mysql-devel \ -openssl-devel libffi libffi-devel python-cffi - -RUN yum install -y python-pip - -RUN yum install -y tar - -RUN tar -zcvf env_rel7_rpm.tar.gz /rpm - -RUN mkdir -p /home/pip - -RUN pip install --upgrade markupsafe virtualenv netaddr pbr oslo.config Cheetah ansible -d /home/pip/ - -RUN tar -zcvf env_rel7_pip.tar.gz /home/pip - -RUN mkdir -p /home/tmp - -RUN cp *.tar.gz /home/tmp - -RUN chmod +x /cp_env.sh - -CMD ["/cp_env.sh"] diff --git a/build/jhenv_template/ubuntu/trusty/Dockerfile b/build/jhenv_template/ubuntu/trusty/Dockerfile deleted file mode 100644 index 650d763c..00000000 --- a/build/jhenv_template/ubuntu/trusty/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM ubuntu:14.04.3 -MAINTAINER Yifei Xue - -ADD ./cp_env.sh /cp_env.sh - -RUN apt-get update - -RUN apt-get install -y -d mkisofs bc curl ipmitool openvswitch-switch \ -git python-pip python-dev figlet \ -libxslt-dev libxml2-dev libvirt-dev \ -build-essential qemu-utils qemu-kvm libvirt-bin \ -virtinst libmysqld-dev \ -libssl-dev libffi-dev python-cffi - -RUN mkdir jh_deb - -RUN cp /var/cache/apt/archives/*.deb jh_deb/ - -RUN tar -zcvf env_trusty_deb.tar.gz jh_deb/ - -RUN apt-get install -y python-pip - -RUN mkdir jh_pip - -RUN pip install --upgrade markupsafe virtualenv cheetah pyyaml requests netaddr pbr oslo.config ansible -d jh_pip/ - -RUN tar -zcvf env_trusty_pip.tar.gz jh_pip/ - -RUN mkdir -p /home/tmp - -RUN cp *.tar.gz /home/tmp - -RUN chmod +x /cp_env.sh - -CMD ["/cp_env.sh"] diff --git a/build/jhenv_template/ubuntu/xenial/Dockerfile b/build/jhenv_template/ubuntu/xenial/Dockerfile deleted file mode 100644 index f70586ea..00000000 --- a/build/jhenv_template/ubuntu/xenial/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM ubuntu:16.04 -MAINTAINER Yifei Xue - -ADD ./cp_env.sh /cp_env.sh - -RUN apt-get update - -RUN apt-get install -y -d mkisofs bc curl ipmitool openvswitch-switch \ -git python-pip python-dev figlet \ -libxslt-dev libxml2-dev libvirt-dev \ -build-essential qemu-utils qemu-kvm libvirt-bin \ -virtinst libmysqld-dev \ -libssl-dev libffi-dev python-cffi - -RUN mkdir jh_deb - -RUN cp /var/cache/apt/archives/*.deb jh_deb/ - -RUN tar -zcvf env_xenial_deb.tar.gz jh_deb/ - -RUN apt-get install -y python-pip - -RUN mkdir jh_pip - -RUN pip install --upgrade markupsafe virtualenv cheetah pyyaml requests netaddr pbr oslo.config ansible -d jh_pip/ - -RUN tar -zcvf env_xenial_pip.tar.gz jh_pip/ - -RUN mkdir -p /home/tmp - -RUN cp *.tar.gz /home/tmp - -RUN chmod +x /cp_env.sh - -CMD ["/cp_env.sh"] diff --git a/build/make_repo.sh b/build/make_repo.sh index f186c46c..f38da7ff 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -33,7 +33,6 @@ set -ex cp /*.tar.gz /result -f EOF - sudo apt-get -f install sudo apt-get install python-yaml -y sudo apt-get install python-cheetah -y } @@ -43,7 +42,7 @@ function make_repo() rm -f ${WORK_PATH}/work/repo/install_packages.sh rm -f ${WORK_PATH}/work/repo/Dockerfile - option=`echo "os-ver:,jh-os:,package-tag:,tmpl:,default-package:, \ + option=`echo "os-ver:,package-tag:,tmpl:,default-package:, \ special-package:,special-package-script-dir:, \ special-package-dir:,ansible-dir:,special-package-dir" | sed 's/ //g'` @@ -54,7 +53,6 @@ function make_repo() eval set -- "$TEMP" os_ver="" - jh_os="" package_tag="" tmpl="" default_package="" @@ -66,7 +64,6 @@ function make_repo() while :; do case "$1" in --os-ver) os_ver=$2; shift 2;; - --jh-os) jh_os=$2; shift 2;; --package-tag) package_tag=$2; shift 2;; --tmpl) tmpl=$2; shift 2;; --default-package) default_package=$2; shift 2;; @@ -84,11 +81,6 @@ function make_repo() return fi - if [[ -n ${package_tag} && ${package_tag} == "jhenv" && -n ${jh_os} ]]; then - make_jhenv_repo - return - fi - if [[ -z ${os_ver} || -z ${package_tag} ]]; then echo "parameter is wrong" exit 1 @@ -275,53 +267,8 @@ function make_pip_repo() cd $WORK_PATH/work/repo; tar -zcvf pip.tar.gz ./pip; cd - } -function make_jhenv_repo() -{ - if [[ ${jh_os} == trusty ]]; then - env_os_name=ubuntu - fi - - if [[ ${jh_os} == xenial ]]; then - env_os_name=ubuntu - fi - - if [[ ${jh_os} =~ rhel[0-9]*$ ]]; then - env_os_name=centos - fi - - if [[ -d ${WORK_PATH}/build/jhenv_template/$env_os_name ]]; then - - jh_env_dockerfile=Dockerfile - jh_env_docker_tmpl=${BUILD_PATH}/jhenv_template/$env_os_name/$jh_os/${jh_env_dockerfile}".tmpl" - jh_env_docker_tag="$jh_os/env" - - rm -rf ${WORK_PATH}/work/repo/jhenv_template - mkdir ${WORK_PATH}/work/repo/jhenv_template - cp -rf ${WORK_PATH}/build/jhenv_template/$env_os_name/$jh_os/${jh_env_dockerfile} ${WORK_PATH}/work/repo/jhenv_template - -cat <${WORK_PATH}/work/repo/jhenv_template/cp_env.sh -#!/bin/bash -set -ex -cp /*.tar.gz /env -f -EOF - - sudo docker build --no-cache=true -t ${jh_env_docker_tag} -f ${WORK_PATH}/work/repo/jhenv_template/${jh_env_dockerfile} ${WORK_PATH}/work/repo/jhenv_template - sudo docker run -t -v ${WORK_PATH}/work/repo:/env ${jh_env_docker_tag} - - image_id=$(sudo docker images|grep ${jh_env_docker_tag}|awk '{print $3}') - - sudo docker rmi -f ${image_id} - -# cd $WORK_PATH/work/repo; tar -zcvf pip.tar.gz ./pip; cd - - fi -} - function make_all_repo() { - for env_os in trusty xanial rhel7; do - make_repo --package-tag jhenv --jh-os $env_os - done - make_repo --package-tag pip make_repo --os-ver rhel7 --package-tag compass \ -- cgit 1.2.3-korg