diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/make_repo.sh | 10 | ||||
| -rw-r--r-- | build/os/centos/ceph_key_release.asc | 29 | ||||
| -rw-r--r-- | build/os/centos/rhel7/juno/Dockerfile.tmpl | 1 | ||||
| -rw-r--r-- | build/templates/RedHat_juno.tmpl | 29 |
4 files changed, 67 insertions, 2 deletions
diff --git a/build/make_repo.sh b/build/make_repo.sh index 6d5faab7..c58a032c 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -20,7 +20,7 @@ function process_env() cat <<EOF >${WORK_PATH}/work/repo/cp_repo.sh #!/bin/bash set -ex -cp /*.tar.gz /result +cp /*.tar.gz /result -f EOF sudo apt-get install python-yaml -y @@ -130,6 +130,7 @@ function make_repo() # copy centos comps.xml to work dir if [[ $arch == RedHat && -f ${WORK_PATH}/build/os/$os_name/comps.xml ]]; then cp -rf ${WORK_PATH}/build/os/$os_name/comps.xml ${WORK_PATH}/work/repo + cp -rf ${WORK_PATH}/build/os/$os_name/ceph_key_release.asc ${WORK_PATH}/work/repo fi sudo docker build -t ${docker_tag} -f ${WORK_PATH}/work/repo/${dockerfile} ${WORK_PATH}/work/repo/ @@ -176,7 +177,7 @@ function make_all_repo() make_repo --os-ver rhel7 --package-tag juno \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ - --default-package "rsyslog strace net-tools wget vim openssh-server dracut-config-rescue dracut-network" + --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" } function main() @@ -185,6 +186,11 @@ function main() if [[ $# -eq 0 ]]; then make_all_repo + elif [ "$1" = "rhel7" ]; then + echo "make rhel7" + 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" else make_repo $* fi diff --git a/build/os/centos/ceph_key_release.asc b/build/os/centos/ceph_key_release.asc new file mode 100644 index 00000000..d2961c52 --- /dev/null +++ b/build/os/centos/ceph_key_release.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFX4hgkBEADLqn6O+UFp+ZuwccNldwvh5PzEwKUPlXKPLjQfXlQRig1flpCH +E0HJ5wgGlCtYd3Ol9f9+qU24kDNzfbs5bud58BeE7zFaZ4s0JMOMuVm7p8JhsvkU +C/Lo/7NFh25e4kgJpjvnwua7c2YrA44ggRb1QT19ueOZLK5wCQ1mR+0GdrcHRCLr +7Sdw1d7aLxMT+5nvqfzsmbDullsWOD6RnMdcqhOxZZvpay8OeuK+yb8FVQ4sOIzB +FiNi5cNOFFHg+8dZQoDrK3BpwNxYdGHsYIwU9u6DWWqXybBnB9jd2pve9PlzQUbO +eHEa4Z+jPqxY829f4ldaql7ig8e6BaInTfs2wPnHJ+606g2UH86QUmrVAjVzlLCm +nqoGymoAPGA4ObHu9X3kO8viMBId9FzooVqR8a9En7ZE0Dm9O7puzXR7A1f5sHoz +JdYHnr32I+B8iOixhDUtxIY4GA8biGATNaPd8XR2Ca1hPuZRVuIiGG9HDqUEtXhV +fY5qjTjaThIVKtYgEkWMT+Wet3DPPiWT3ftNOE907e6EWEBCHgsEuuZnAbku1GgD +LBH4/a/yo9bNvGZKRaTUM/1TXhM5XgVKjd07B4cChgKypAVHvef3HKfCG2U/DkyA +LjteHt/V807MtSlQyYaXUTGtDCrQPSlMK5TjmqUnDwy6Qdq8dtWN3DtBWQARAQAB +tCpDZXBoLmNvbSAocmVsZWFzZSBrZXkpIDxzZWN1cml0eUBjZXBoLmNvbT6JAjgE +EwECACIFAlX4hgkCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEOhKwsBG +DzmUXdIQAI8YPcZMBWdv489q8CzxlfRIRZ3Gv/G/8CH+EOExcmkVZ89mVHngCdAP +DOYCl8twWXC1lwJuLDBtkUOHXNuR5+Jcl5zFOUyldq1Hv8u03vjnGT7lLJkJoqpG +l9QD8nBqRvBU7EM+CU7kP8+09b+088pULil+8x46PwgXkvOQwfVKSOr740Q4J4nm +/nUOyTNtToYntmt2fAVWDTIuyPpAqA6jcqSOC7Xoz9cYxkVWnYMLBUySXmSS0uxl +3p+wK0lMG0my/gb+alke5PAQjcE5dtXYzCn+8Lj0uSfCk8Gy0ZOK2oiUjaCGYN6D +u72qDRFBnR3jaoFqi03bGBIMnglGuAPyBZiI7LJgzuT9xumjKTJW3kN4YJxMNYu1 +FzmIyFZpyvZ7930vB2UpCOiIaRdZiX4Z6ZN2frD3a/vBxBNqiNh/BO+Dex+PDfI4 +TqwF8zlcjt4XZ2teQ8nNMR/D8oiYTUW8hwR4laEmDy7ASxe0p5aijmUApWq5UTsF ++s/QbwugccU0iR5orksM5u9MZH4J/mFGKzOltfGXNLYI6D5Mtwrnyi0BsF5eY0u6 +vkdivtdqrq2DXY+ftuqLOQ7b+t1RctbcMHGPptlxFuN9ufP5TiTWSpfqDwmHCLsT +k2vFiMwcHdLpQ1IH8ORVRgPPsiBnBOJ/kIiXG2SxPUTjjEGOVgeA +=/Tod +-----END PGP PUBLIC KEY BLOCK----- diff --git a/build/os/centos/rhel7/juno/Dockerfile.tmpl b/build/os/centos/rhel7/juno/Dockerfile.tmpl index d0d45ae4..450e5c85 100644 --- a/build/os/centos/rhel7/juno/Dockerfile.tmpl +++ b/build/os/centos/rhel7/juno/Dockerfile.tmpl @@ -17,6 +17,7 @@ RUN chmod +x /tmp/chigang/$script RUN /tmp/chigang/$script #end for ADD ./comps.xml / +ADD ./ceph_key_release.asc / ADD ./install_packages.sh /tmp/chigang/install_packages.sh RUN chmod +x /tmp/chigang/install_packages.sh RUN /tmp/chigang/install_packages.sh diff --git a/build/templates/RedHat_juno.tmpl b/build/templates/RedHat_juno.tmpl index 9741b860..91be6151 100644 --- a/build/templates/RedHat_juno.tmpl +++ b/build/templates/RedHat_juno.tmpl @@ -1,10 +1,13 @@ #!/bin/bash set -x +yum remove systemd -y # add 163 repo yum install wget -y wget -O /etc/yum.repos.d/CentOS7-Base-163.repo http://mirrors.163.com/.help/CentOS7-Base-163.repo +wget -O /epel-release-7-5.noarch.rpm http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm yum remove wget iptables-services -y +yum update -y rm -f /etc/yum.repos.d/CentOS-*.repo yum repolist yum clean all @@ -35,6 +38,26 @@ gpgkey=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon protect=1 EOF +cat <<EOF >/etc/yum.repos.d/ceph.repo +[ceph] +name=Ceph packages for x86_64 +baseurl=http://ceph.com/rpm-hammer/rhel7/x86_64 +enabled=1 +priority=2 +gpgcheck=1 +type=rpm-md +gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc + +[ceph-noarch] +name=Ceph noarch packages +baseurl=http://ceph.com/rpm-hammer/rhel7/noarch +enabled=1 +priority=2 +gpgcheck=1 +type=rpm-md +gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc +EOF + yum update -y yum install createrepo -y yum install tar -y @@ -58,6 +81,12 @@ find /var/cache/yum/ -name *.rpm | xargs -i cp {} /centos7-juno-ppa/Packages/ rm /centos7-juno-ppa/Packages/selinux-policy* -f rm /centos7-juno-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 |