aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2016-01-27 11:21:41 +0800
committercarey xu <carey.xuhan@huawei.com>2016-01-27 03:29:08 +0000
commitea87da8bdf478253bcbb6dc1ab1a5b8d2e17e613 (patch)
tree50c35ffe4d399ac90f0cdb8826112eb6767f56f5 /deploy
parenta9dc63004652d5ea7fa57714d06cfb1b6a9586e2 (diff)
bugfix: prepare python venv
JIRA: bugfix_python_env Change-Id: Ie7f3e295c7c283ff3e805bed13029174c2dda258 Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/compass_vm.sh2
-rwxr-xr-xdeploy/launch.sh3
-rwxr-xr-xdeploy/prepare.sh26
3 files changed, 22 insertions, 9 deletions
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index 196df4a..394d7c5 100755
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -32,7 +32,7 @@ function install_compass() {
local inventory_file=$compass_vm_dir/inventory.file
sed -i "s/mgmt_next_ip:.*/mgmt_next_ip: ${COMPASS_SERVER}/g" $WORK_DIR/installer/compass-install/install/group_vars/all
echo "compass_nodocker ansible_ssh_host=$MGMT_IP ansible_ssh_port=22" > $inventory_file
- PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o ControlMaster=auto -o ControlPersist=60s' python /usr/local/bin/ansible-playbook -e pipeline=true --private-key=$rsa_file --user=root --connection=ssh --inventory-file=$inventory_file $WORK_DIR/installer/compass-install/install/$1
+ PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook -e pipeline=true --private-key=$rsa_file --user=root --connection=ssh --inventory-file=$inventory_file $WORK_DIR/installer/compass-install/install/$1
exit_status=$?
rm $inventory_file
if [[ $exit_status != 0 ]];then
diff --git a/deploy/launch.sh b/deploy/launch.sh
index b9e4769..d8e20f0 100755
--- a/deploy/launch.sh
+++ b/deploy/launch.sh
@@ -4,6 +4,8 @@ WORK_DIR=$COMPASS_DIR/work/deploy
mkdir -p $WORK_DIR/script
+source ${COMPASS_DIR}/deploy/prepare.sh
+prepare_python_env
source ${COMPASS_DIR}/util/log.sh
source ${COMPASS_DIR}/deploy/deploy_parameter.sh
source $(process_input_para $*) || exit 1
@@ -12,7 +14,6 @@ source ${COMPASS_DIR}/deploy/conf/${FLAVOR}.conf
source ${COMPASS_DIR}/deploy/conf/${TYPE}.conf
source ${COMPASS_DIR}/deploy/conf/base.conf
source ${COMPASS_DIR}/deploy/conf/compass.conf
-source ${COMPASS_DIR}/deploy/prepare.sh
source ${COMPASS_DIR}/deploy/network.sh
source ${COMPASS_DIR}/deploy/host_${TYPE}.sh
source ${COMPASS_DIR}/deploy/compass_vm.sh
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index db41091..a85be6f 100755
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -33,19 +33,14 @@ function prepare_env() {
sudo apt-get install -y --force-yes mkisofs bc curl ipmitool openvswitch-switch
sudo apt-get install -y --force-yes git python-dev
sudo apt-get install -y --force-yes libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev
- sudo pip install --upgrade ansible==1.9.4
- sudo pip install --upgrade virtualenv
- sudo pip install --upgrade netaddr
- sudo apt-get install python-oslo.config
sudo service libvirt-bin restart
# prepare work dir
- rm -rf $WORK_DIR/{installer,vm,network,iso,venv}
+ rm -rf $WORK_DIR/{installer,vm,network,iso}
mkdir -p $WORK_DIR/installer
mkdir -p $WORK_DIR/vm
mkdir -p $WORK_DIR/network
mkdir -p $WORK_DIR/iso
- mkdir -p $WORK_DIR/venv
mkdir -p $WORK_DIR/cache
download_iso
@@ -61,7 +56,24 @@ function prepare_env() {
rm -rf $WORK_DIR/mnt
chmod 755 $WORK_DIR -R
- virtualenv $WORK_DIR/venv
sudo cp ${COMPASS_DIR}/deploy/qemu_hook.sh /etc/libvirt/hooks/qemu
}
+
+function prepare_python_env() {
+ rm -rf $WORK_DIR/venv
+ mkdir -p $WORK_DIR/venv
+
+ sudo apt-get install -y --force-yes python-pip
+ sudo pip install --upgrade virtualenv
+ virtualenv $WORK_DIR/venv
+ source $WORK_DIR/venv/bin/activate
+
+ pip install --upgrade pip
+ pip install --upgrade cheetah
+ pip install --upgrade pyyaml
+ pip install --upgrade requests
+ pip install --upgrade netaddr
+ pip install --upgrade oslo.config
+ pip install --upgrade ansible==1.9.4
+}