diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/make_repo.sh | 43 | ||||
| -rw-r--r-- | build/templates/Debian_juno.tmpl | 13 | ||||
| -rw-r--r-- | build/templates/Debian_kilo.tmpl | 13 | ||||
| -rw-r--r-- | build/templates/Debian_liberty.tmpl | 14 | ||||
| -rw-r--r-- | build/templates/RedHat_juno.tmpl | 32 | ||||
| -rw-r--r-- | build/templates/RedHat_kilo.tmpl | 36 | ||||
| -rw-r--r-- | build/templates/RedHat_liberty.tmpl | 38 |
7 files changed, 94 insertions, 95 deletions
diff --git a/build/make_repo.sh b/build/make_repo.sh index 16490c67..15e1f16e 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -169,46 +169,35 @@ function make_pip_repo() function make_all_repo() { - make_repo --package-tag pip - - make_repo --os-ver rhel7 --package-tag compass \ - --tmpl "${WORK_PATH}/build/templates/compass_core.tmpl" \ - --default-package "kernel-devel epel-release wget libxml2 glibc gcc perl openssl-libs mkisofs createrepo lsof \ - python-yaml python-jinja2 python-paramiko elasticsearch logstash bind-license vim nmap-ncat \ - yum cobbler cobbler-web createrepo mkisofs syslinux pykickstart bind rsync fence-agents \ - dhcp xinetd tftp-server httpd libselinux-python python-setuptools python-devel mysql-devel \ - mysql-server mysql MySQL-python redis mod_wsgi net-tools rabbitmq-server nfs-utils" \ - --special-package "kibana jdk" - - make_repo --os-ver trusty --package-tag juno \ - --ansible-dir $WORK_PATH/deploy/adapters/ansible \ - --default-package "openssh-server" \ - --special-package "openvswitch-switch" - - make_repo --os-ver trusty --package-tag kilo \ - --ansible-dir $WORK_PATH/deploy/adapters/ansible \ - --default-package "openssh-server" \ - --special-package "openvswitch-switch" - - make_repo --os-ver trusty --package-tag liberty \ +# make_repo --package-tag pip + +# make_repo --os-ver rhel7 --package-tag compass \ +# --tmpl "${WORK_PATH}/build/templates/compass_core.tmpl" \ +# --default-package "kernel-devel epel-release wget libxml2 glibc gcc perl openssl-libs mkisofs createrepo lsof \ +# python-yaml python-jinja2 python-paramiko elasticsearch logstash bind-license vim nmap-ncat \ +# yum cobbler cobbler-web createrepo mkisofs syslinux pykickstart bind rsync fence-agents \ +# dhcp xinetd tftp-server httpd libselinux-python python-setuptools python-devel mysql-devel \ +# mysql-server mysql MySQL-python redis mod_wsgi net-tools rabbitmq-server nfs-utils" \ +# --special-package "kibana jdk" + + for opv in juno kilo liberty; do + make_repo --os-ver trusty --package-tag $opv \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ --default-package "openssh-server" \ --special-package "openvswitch-switch" + done make_repo --os-ver rhel7 --package-tag juno \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \ dracut-config-rescue-033-241.el7_1.3 dracut-network-033-241.el7_1.3" + for opv in kilo liberty; do make_repo --os-ver rhel7 --package-tag kilo \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \ dracut-config-rescue-033-241.el7_1.5 dracut-network-033-241.el7_1.5" - - make_repo --os-ver rhel7 --package-tag liberty \ - --ansible-dir $WORK_PATH/deploy/adapters/ansible \ - --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \ - dracut-config-rescue-033-241.el7_1.5 dracut-network-033-241.el7_1.5" + done } function main() diff --git a/build/templates/Debian_juno.tmpl b/build/templates/Debian_juno.tmpl index 2f88cb2e..4cf42975 100644 --- a/build/templates/Debian_juno.tmpl +++ b/build/templates/Debian_juno.tmpl @@ -1,9 +1,10 @@ #!/bin/bash set -ex -# add openstack juno repo +#set OPV="juno" + sudo apt-get update && apt-get install -y software-properties-common -sudo add-apt-repository -y cloud-archive:juno +sudo add-apt-repository -y cloud-archive:$OPV # add galeracluster repo #sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db @@ -30,8 +31,8 @@ sudo apt-get -d install $pkg -y #end for #make repo -mkdir -p trusty-juno-ppa/conf -cat <<EOF > trusty-juno-ppa/conf/distributions +mkdir -p trusty-$OPV-ppa/conf +cat <<EOF > trusty-$OPV-ppa/conf/distributions Codename: trusty Components: main Architectures: amd64 @@ -40,6 +41,6 @@ EOF mkdir deb find /var/cache/apt/ -name *.deb | xargs -i cp {} deb -reprepro -b trusty-juno-ppa includedeb trusty deb/*.deb +reprepro -b trusty-$OPV-ppa includedeb trusty deb/*.deb -tar -zcvf /trusty-juno-ppa.tar.gz ./trusty-juno-ppa +tar -zcvf /trusty-$OPV-ppa.tar.gz ./trusty-$OPV-ppa diff --git a/build/templates/Debian_kilo.tmpl b/build/templates/Debian_kilo.tmpl index 223173b5..d8efafbd 100644 --- a/build/templates/Debian_kilo.tmpl +++ b/build/templates/Debian_kilo.tmpl @@ -1,9 +1,10 @@ #!/bin/bash set -ex -# add openstack kilo repo +#set OPV="kilo" + sudo apt-get update && apt-get install -y software-properties-common -sudo add-apt-repository -y cloud-archive:kilo +sudo add-apt-repository -y cloud-archive:$OPV # add galeracluster repo sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 D669017EBC19DDBA @@ -28,8 +29,8 @@ sudo apt-get -d install $pkg -y #end for #make repo -mkdir -p trusty-kilo-ppa/conf -cat <<EOF > trusty-kilo-ppa/conf/distributions +mkdir -p trusty-$OPV-ppa/conf +cat <<EOF > trusty-$OPV-ppa/conf/distributions Codename: trusty Components: main Architectures: amd64 @@ -38,6 +39,6 @@ EOF mkdir deb find /var/cache/apt/ -name *.deb | xargs -i cp {} deb -reprepro -b trusty-kilo-ppa includedeb trusty deb/*.deb +reprepro -b trusty-$OPV-ppa includedeb trusty deb/*.deb -tar -zcvf /trusty-kilo-ppa.tar.gz ./trusty-kilo-ppa +tar -zcvf /trusty-$OPV-ppa.tar.gz ./trusty-$OPV-ppa diff --git a/build/templates/Debian_liberty.tmpl b/build/templates/Debian_liberty.tmpl index ede5b51f..93bd9f3e 100644 --- a/build/templates/Debian_liberty.tmpl +++ b/build/templates/Debian_liberty.tmpl @@ -1,9 +1,11 @@ #!/bin/bash set -ex -# add openstack liberty repo +#set OPV="liberty" + +# add openstack $OPV repo sudo apt-get update && apt-get install -y software-properties-common -sudo add-apt-repository -y cloud-archive:liberty +sudo add-apt-repository -y cloud-archive:$OPV # add galeracluster repo #sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db @@ -30,8 +32,8 @@ sudo apt-get -d install $pkg -y #end for #make repo -mkdir -p trusty-liberty-ppa/conf -cat <<EOF > trusty-liberty-ppa/conf/distributions +mkdir -p trusty-$OPV-ppa/conf +cat <<EOF > trusty-$OPV-ppa/conf/distributions Codename: trusty Components: main Architectures: amd64 @@ -44,6 +46,6 @@ rm -rf /var/cache/apt/python-pyasn1_0.1.7-1ubuntu2_all.deb mkdir deb find /var/cache/apt/ -name *.deb | xargs -i cp {} deb -reprepro -b trusty-liberty-ppa includedeb trusty deb/*.deb +reprepro -b trusty-$OPV-ppa includedeb trusty deb/*.deb -tar -zcvf /trusty-liberty-ppa.tar.gz ./trusty-liberty-ppa +tar -zcvf /trusty-$OPV-ppa.tar.gz ./trusty-$OPV-ppa diff --git a/build/templates/RedHat_juno.tmpl b/build/templates/RedHat_juno.tmpl index 60a03b9f..3e172637 100644 --- a/build/templates/RedHat_juno.tmpl +++ b/build/templates/RedHat_juno.tmpl @@ -1,6 +1,8 @@ #!/bin/bash set -x +#set OPV="juno" + yum remove systemd -y # add 163 repo yum install wget -y @@ -10,10 +12,10 @@ yum update -y #rm -f /etc/yum.repos.d/CentOS-*.repo yum repolist yum clean all -# add openstack juno repo + yum install yum-plugin-priorities -y yum install http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm -y -yum install http://rdo.fedorapeople.org/openstack-juno/rdo-release-juno.rpm -y +yum install http://rdo.fedorapeople.org/openstack-$OPV/rdo-release-$OPV.rpm -y # modify centos7 repo for workaround sed -i 's/epel-Derived from Red Hat Enterprise Linux 7.1 (Source)/epel-7/g' /etc/yum.repos.d/rdo-release.repo @@ -75,19 +77,19 @@ yum -y install --skip-broken --downloadonly #echo ' '.join(packages) #make repo -mkdir -p /centos7-juno-ppa/{Packages,repodata} +mkdir -p /centos7-$OPV-ppa/{Packages,repodata} -find /var/cache/yum/ -name "*.rpm" | xargs -i cp {} /centos7-juno-ppa/Packages/ +find /var/cache/yum/ -name "*.rpm" | xargs -i cp {} /centos7-$OPV-ppa/Packages/ -rm /centos7-juno-ppa/Packages/selinux-policy* -f -rm /centos7-juno-ppa/Packages/systemd* -f +rm /centos7-$OPV-ppa/Packages/selinux-policy* -f +rm /centos7-$OPV-ppa/Packages/systemd* -f -mv /epel-release-7-5.noarch.rpm /centos7-juno-ppa/Packages/ -cp /comps.xml /centos7-juno-ppa/ -cp /ceph_key_release.asc /centos7-juno-ppa/ -createrepo -g comps.xml /centos7-juno-ppa -mkdir /centos7-juno-ppa/noarch -mkdir /centos7-juno-ppa/noarch/Packages -cp -r /centos7-juno-ppa/Packages/ceph* /centos7-juno-ppa/noarch/Packages/ -cp -r /centos7-juno-ppa/repodata/ /centos7-juno-ppa/noarch/ -tar -zcvf /centos7-juno-ppa.tar.gz /centos7-juno-ppa +mv /epel-release-7-5.noarch.rpm /centos7-$OPV-ppa/Packages/ +cp /comps.xml /centos7-$OPV-ppa/ +cp /ceph_key_release.asc /centos7-$OPV-ppa/ +createrepo -g comps.xml /centos7-$OPV-ppa +mkdir /centos7-$OPV-ppa/noarch +mkdir /centos7-$OPV-ppa/noarch/Packages +cp -r /centos7-$OPV-ppa/Packages/ceph* /centos7-$OPV-ppa/noarch/Packages/ +cp -r /centos7-$OPV-ppa/repodata/ /centos7-$OPV-ppa/noarch/ +tar -zcvf /centos7-$OPV-ppa.tar.gz /centos7-$OPV-ppa diff --git a/build/templates/RedHat_kilo.tmpl b/build/templates/RedHat_kilo.tmpl index 826acb8d..f9942d8f 100644 --- a/build/templates/RedHat_kilo.tmpl +++ b/build/templates/RedHat_kilo.tmpl @@ -1,6 +1,8 @@ #!/bin/bash set -x +#set OPV="kilo" + yum remove systemd -y # add 163 repo yum install wget -y @@ -10,10 +12,10 @@ yum update -y #rm -f /etc/yum.repos.d/CentOS-*.repo yum repolist yum clean all -# add openstack kilo repo + yum install yum-plugin-priorities -y yum install http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm -y -yum install http://rdo.fedorapeople.org/openstack-kilo/rdo-release-kilo.rpm -y +yum install http://rdo.fedorapeople.org/openstack-$OPV/rdo-release-$OPV.rpm -y # modify centos7 repo for workaround sed -i 's/epel-Derived from Red Hat Enterprise Linux 7.1 (Source)/epel-7/g' /etc/yum.repos.d/rdo-release.repo @@ -81,21 +83,21 @@ yum -y install --skip-broken --downloadonly #echo ' '.join(packages) #make repo -mkdir -p /centos7-kilo-ppa/{Packages,repodata} +mkdir -p /centos7-$OPV-ppa/{Packages,repodata} -find /var/cache/yum/ -name "*.rpm" | xargs -i cp {} /centos7-kilo-ppa/Packages/ +find /var/cache/yum/ -name "*.rpm" | xargs -i cp {} /centos7-$OPV-ppa/Packages/ -rm /centos7-kilo-ppa/Packages/selinux-policy* -f -rm /centos7-kilo-ppa/Packages/systemd* -f -rm /centos7-kilo-ppa/Packages/openssl-1.0.1e-42.el7.9.x86_64.rpm -rm /centos7-kilo-ppa/Packages/libnl3-3.2.21-9.el7_1.x86_64.rpm +rm /centos7-$OPV-ppa/Packages/selinux-policy* -f +rm /centos7-$OPV-ppa/Packages/systemd* -f +rm /centos7-$OPV-ppa/Packages/openssl-1.0.1e-42.el7.9.x86_64.rpm +rm /centos7-$OPV-ppa/Packages/libnl3-3.2.21-9.el7_1.x86_64.rpm -mv /epel-release-7-5.noarch.rpm /centos7-kilo-ppa/Packages/ -cp /comps.xml /centos7-kilo-ppa/ -cp /ceph_key_release.asc /centos7-kilo-ppa/ -createrepo -g comps.xml /centos7-kilo-ppa -mkdir /centos7-kilo-ppa/noarch -mkdir /centos7-kilo-ppa/noarch/Packages -cp -r /centos7-kilo-ppa/Packages/ceph* /centos7-kilo-ppa/noarch/Packages/ -cp -r /centos7-kilo-ppa/repodata/ /centos7-kilo-ppa/noarch/ -tar -zcvf /centos7-kilo-ppa.tar.gz /centos7-kilo-ppa +mv /epel-release-7-5.noarch.rpm /centos7-$OPV-ppa/Packages/ +cp /comps.xml /centos7-$OPV-ppa/ +cp /ceph_key_release.asc /centos7-$OPV-ppa/ +createrepo -g comps.xml /centos7-$OPV-ppa +mkdir /centos7-$OPV-ppa/noarch +mkdir /centos7-$OPV-ppa/noarch/Packages +cp -r /centos7-$OPV-ppa/Packages/ceph* /centos7-$OPV-ppa/noarch/Packages/ +cp -r /centos7-$OPV-ppa/repodata/ /centos7-$OPV-ppa/noarch/ +tar -zcvf /centos7-$OPV-ppa.tar.gz /centos7-$OPV-ppa diff --git a/build/templates/RedHat_liberty.tmpl b/build/templates/RedHat_liberty.tmpl index baafc17f..74aada7b 100644 --- a/build/templates/RedHat_liberty.tmpl +++ b/build/templates/RedHat_liberty.tmpl @@ -1,15 +1,17 @@ #!/bin/bash set -x +#set OPV="liberty" + yum remove systemd -y # add 163 repo #rm -f /etc/yum.repos.d/CentOS-*.repo yum repolist yum clean all -# add openstack liberty repo + yum install yum-plugin-priorities -y yum install http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm -y -yum install http://rdo.fedorapeople.org/openstack-liberty/rdo-release-liberty.rpm -y +yum install http://rdo.fedorapeople.org/openstack-$OPV/rdo-release-$OPV.rpm -y # modify centos7 repo for workaround sed -i 's/epel-Derived from Red Hat Enterprise Linux 7.1 (Source)/epel-7/g' /etc/yum.repos.d/rdo-release.repo @@ -78,19 +80,19 @@ yum -y install --skip-broken --downloadonly #echo ' '.join(packages) yum -y install --skip-broken --downloadonly #echo ' '.join(packages) #make repo -mkdir -p /centos7-liberty-ppa/{Packages,repodata} - -find /var/cache/yum/ -name "*.rpm" | xargs -i cp {} /centos7-liberty-ppa/Packages/ - -rm /centos7-liberty-ppa/Packages/selinux-policy* -f -rm /centos7-liberty-ppa/Packages/systemd* -f - -mv /epel-release-7-5.noarch.rpm /centos7-liberty-ppa/Packages/ -cp /comps.xml /centos7-liberty-ppa/ -cp /ceph_key_release.asc /centos7-liberty-ppa/ -createrepo -g comps.xml /centos7-liberty-ppa -mkdir /centos7-liberty-ppa/noarch -mkdir /centos7-liberty-ppa/noarch/Packages -cp -r /centos7-liberty-ppa/Packages/ceph* /centos7-liberty-ppa/noarch/Packages/ -cp -r /centos7-liberty-ppa/repodata/ /centos7-liberty-ppa/noarch/ -tar -zcvf /centos7-liberty-ppa.tar.gz /centos7-liberty-ppa +mkdir -p /centos7-$OPV-ppa/{Packages,repodata} + +find /var/cache/yum/ -name "*.rpm" | xargs -i cp {} /centos7-$OPV-ppa/Packages/ + +rm /centos7-$OPV-ppa/Packages/selinux-policy* -f +rm /centos7-$OPV-ppa/Packages/systemd* -f + +mv /epel-release-7-5.noarch.rpm /centos7-$OPV-ppa/Packages/ +cp /comps.xml /centos7-$OPV-ppa/ +cp /ceph_key_release.asc /centos7-$OPV-ppa/ +createrepo -g comps.xml /centos7-$OPV-ppa +mkdir /centos7-$OPV-ppa/noarch +mkdir /centos7-$OPV-ppa/noarch/Packages +cp -r /centos7-$OPV-ppa/Packages/ceph* /centos7-$OPV-ppa/noarch/Packages/ +cp -r /centos7-$OPV-ppa/repodata/ /centos7-$OPV-ppa/noarch/ +tar -zcvf /centos7-$OPV-ppa.tar.gz /centos7-$OPV-ppa |