diff options
| -rwxr-xr-x | build.sh | 6 | ||||
| -rw-r--r-- | build/build.conf | 1 | ||||
| -rw-r--r-- | build/os/ubuntu/xenial/mitaka/Dockerfile.tmpl | 26 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/Debian.yml | 1 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/RedHat.yml | 1 |
5 files changed, 34 insertions, 1 deletions
@@ -78,7 +78,7 @@ function download_local() function download_packages() { - for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $TRUSTY_MITAKA_PPA $UBUNTU_ISO \ + for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $TRUSTY_MITAKA_PPA $XENIAL_MITAKA_PPA $UBUNTU_ISO \ $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $CENTOS7_LIBERTY_PPA $CENTOS7_MITAKA_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG \ $PIP_REPO $ANSIBLE_MODULE; do @@ -124,6 +124,10 @@ function copy_file() cp $CACHE_DIR/`basename $TRUSTY_MITAKA_PPA` $new/repos/cobbler/ubuntu/ppa/ -rf fi + if [[ $XENIAL_MITAKA_PPA ]]; then + cp $CACHE_DIR/`basename $XENIAL_MITAKA_PPA` $new/repos/cobbler/ubuntu/ppa/ -rf + fi + if [[ $CENTOS_ISO ]]; then cp $CACHE_DIR/`basename $CENTOS_ISO` $new/repos/cobbler/centos/iso/ -rf fi diff --git a/build/build.conf b/build/build.conf index 9ad99add..138a2420 100644 --- a/build/build.conf +++ b/build/build.conf @@ -24,6 +24,7 @@ export UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso} #export TRUSTY_JUNO_PPA=${TRUSTY_JUNO_PPA:-$PACKAGE_URL/trusty-juno-ppa.tar.gz} export TRUSTY_LIBERTY_PPA=${TRUSTY_LIBERTY_PPA:-$PACKAGE_URL/trusty-liberty-ppa.tar.gz} export TRUSTY_MITAKA_PPA=${TRUSTY_MITAKA_PPA:-$PACKAGE_URL/trusty-mitaka-ppa.tar.gz} +export XENIAL_MITAKA_PPA=${XENIAL_MITAKA_PPA:-$PACKAGE_URL/xenial-mitaka-ppa.tar.gz} #export CENTOS7_JUNO_PPA=${CENTOS7_JUNO_PPA:-$PACKAGE_URL/centos7-juno-ppa.tar.gz} #export CENTOS7_KILO_PPA=${CENTOS7_KILO_PPA:-$PACKAGE_URL/centos7-kilo-ppa.tar.gz} export CENTOS7_LIBERTY_PPA=${CENTOS7_LIBERTY_PPA:-$PACKAGE_URL/centos7-liberty-ppa.tar.gz} diff --git a/build/os/ubuntu/xenial/mitaka/Dockerfile.tmpl b/build/os/ubuntu/xenial/mitaka/Dockerfile.tmpl new file mode 100644 index 00000000..4b24c0a3 --- /dev/null +++ b/build/os/ubuntu/xenial/mitaka/Dockerfile.tmpl @@ -0,0 +1,26 @@ +FROM ubuntu:16.04 +MAINTAINER Chigang(Justin) <chigang@huawei.com> + +#RUN apt-get update + +RUN rm -f /etc/apt/apt.conf.d/docker-clean +#set packages = $getVar('spcial_packages', []) +#for package in $packages +ADD ./Debian/packages/debian-packages/$package /var/cache/apt/archives/ +#end for +#set scripts = $getVar('scripts', []) +#for script in $scripts +ADD ./Debian/script/$script /tmp/chigang/$script +RUN chmod +x /tmp/chigang/$script +RUN /tmp/chigang/$script +#end for +ADD ./install_packages.sh /tmp/chigang/install_packages.sh +RUN chmod +x /tmp/chigang/install_packages.sh +RUN /tmp/chigang/install_packages.sh + +ADD ./cp_repo.sh /tmp/chigang/cp_repo.sh +RUN chmod +x /tmp/chigang/cp_repo.sh +RUN mkdir /result + +CMD ["/tmp/chigang/cp_repo.sh"] +#VOLUME /tmp/chigang diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/Debian.yml index 59a4dbd9..c480dd9f 100755 --- a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/Debian.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/Debian.yml @@ -10,5 +10,6 @@ packages: - software-properties-common - crudini + - git services: [] diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/RedHat.yml b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/RedHat.yml index 59a4dbd9..c480dd9f 100755 --- a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/RedHat.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/vars/RedHat.yml @@ -10,5 +10,6 @@ packages: - software-properties-common - crudini + - git services: [] |