summaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
authorYao Lu <lu.yao135@zte.com.cn>2016-10-25 09:04:16 +0800
committerYao Lu <lu.yao135@zte.com.cn>2016-11-03 10:46:06 +0800
commit6a54cb0cdd4b6a2266134c328a27b9f76e4c2e2f (patch)
tree972698bc266b4943584dc54440bf49a33dab011d /code
parent928e693b16310a8934bf20ce9e15eb84ca7d4d4f (diff)
add patch of openstack/daisycloud
the patch is about integrate kolla tar and tgz and centos to daisy bin and cp to appoint path Change-Id: I3043d2a38f15cdff44f9c777bff8bb5e517684bd Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Diffstat (limited to 'code')
-rwxr-xr-xcode/install_interface_patch.sh19
-rwxr-xr-xcode/makefile_patch.sh27
2 files changed, 46 insertions, 0 deletions
diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh
new file mode 100755
index 00000000..e0ac0876
--- /dev/null
+++ b/code/install_interface_patch.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+##############################################################################
+# Copyright (c) 2016 ZTE Corporation and others.
+# hu.zhijiang@zte.com.cn
+# lu.yao135@zte.com.cn
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+mkdir -p /home/kolla_install/docker
+if [ ! -e "/home/kolla_install/docker/registry-mitaka-latest.tgz" ];then
+ cp registry-mitaka-latest.tgz /home/kolla_install/docker
+fi
+if [ ! -e "/home/kolla_install/docker/registry-server.tar" ];then
+ cp registry-server.tar /home/kolla_install/docker
+fi
+cp CentOS-7-x86_64-Minimal-1511.iso /var/lib/daisy/kolla
+
diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh
new file mode 100755
index 00000000..afcc4c15
--- /dev/null
+++ b/code/makefile_patch.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+##############################################################################
+# Copyright (c) 2016 ZTE Corporation and others.
+# hu.zhijiang@zte.com.cn
+# lu.yao135@zte.com.cn
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+TOOLS_PATH=$1
+CACHE_PATH=/home/cache
+if [ ! -d $CACHE_PATH ]; then mkdir -p $CACHE_PATH ; fi
+if [ ! -f $CACHE_PATH/CentOS-7-x86_64-Minimal-1511.iso ]; then
+ wget -P $CACHE_PATH "http://mirrors.163.com/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1511.iso"
+fi
+if [ ! -f $CACHE_PATH/registry-2.0.3.tgz ]; then
+ wget -P $CACHE_PATH "ftp://openuser:123@120.76.145.166/registry-mitaka-latest.tgz"
+fi
+if [ ! -f $CACHE_PATH/registry-server.tar ]; then
+ wget -P $CACHE_PATH "ftp://openuser:123@120.76.145.166/registry-server.tar"
+fi
+cp $CACHE_PATH/CentOS-7-x86_64-Minimal-1511.iso $TOOLS_PATH/setup/bin_temp/
+cp $CACHE_PATH/registry-2.0.3.tgz $TOOLS_PATH/setup/bin_temp/
+cp $CACHE_PATH/registry-server.tar $TOOLS_PATH/setup/bin_temp/
+cp $TOOLS_PATH/setup/install_interface_patch.sh $TOOLS_PATH/setup/bin_temp/
+chmod +x $TOOLS_PATH/setup/bin_temp/install_interface_patch.sh