Merge "Revert "Prepare the jump host offline""

3 files changed, 0 insertions, 124 deletions

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 <xueyifei@huawei.com>
-
-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 <xueyifei@huawei.com>
-
-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 <xueyifei@huawei.com>
-
-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"]