aboutsummaryrefslogtreecommitdiffstats
path: root/build/make_repo.sh
diff options
context:
space:
mode:
authorgrakiss <grakiss.wanglei@huawei.com>2015-09-21 09:48:33 +0800
committergrakiss <grakiss.wanglei@huawei.com>2015-09-24 15:43:56 +0800
commit47cfbaa9070f5a12272627ff3648e28388f279f5 (patch)
tree407b03c64a1255f57f1c3eb18043ce3d63201236 /build/make_repo.sh
parentd16d74fbbe738f0d15366dedf9f5e042505ee1e8 (diff)
support ceph deploy for centos
JIRA: COMPASS-60 Change-Id: I9bcc5009b7d9b2f3cc48f1f1a448a1f07af65494 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
Diffstat (limited to 'build/make_repo.sh')
-rwxr-xr-xbuild/make_repo.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/build/make_repo.sh b/build/make_repo.sh
index 9a56cdf9..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/
@@ -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