diff options
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml | 2 | ||||
| -rwxr-xr-x | deploy/compass_vm.sh | 11 | ||||
| -rwxr-xr-x | deploy/deploy_parameter.sh | 8 | ||||
| -rwxr-xr-x | deploy/launch.sh | 1 | ||||
| -rwxr-xr-x | deploy/network.sh | 2 | ||||
| -rwxr-xr-x | deploy/prepare.sh | 8 |
7 files changed, 31 insertions, 3 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml index 7a507c88..95dd2e89 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml @@ -142,7 +142,7 @@ ############################################# - name: wait for keystone ready - wait_for: port=35357 delay=3 timeout=10 host={{ internal_vip.ip }} + wait_for: port=35357 delay=3 timeout=10 host={{ internal_ip }} #- name: cron job to purge expired tokens hourly # cron: diff --git a/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml b/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml index 574ebabd..e7e9297e 100644 --- a/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml +++ b/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml @@ -12,7 +12,7 @@ shell: su -s /bin/sh -c 'keystone-manage db_sync' keystone - name: wait for keystone ready - wait_for: port=35357 delay=3 timeout=10 host={{ internal_vip.ip }} + wait_for: port=35357 delay=3 timeout=10 host={{ internal_ip }} - name: cron job to purge expired tokens hourly cron: diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh index dc391acc..0c213e31 100755 --- a/deploy/compass_vm.sh +++ b/deploy/compass_vm.sh @@ -59,7 +59,16 @@ function wait_ok() { sleep 1 let retry+=1 if [[ $retry -ge $1 ]];then - timeout 1s ssh $ssh_args root@$MGMT_IP "exit" + # first try + ssh $ssh_args root@$MGMT_IP "exit" + # second try + ssh $ssh_args root@$MGMT_IP "exit" + exit_status=$? + if [[ $exit_status == 0 ]]; then + log_warn "final ssh login compass success !!!" + break + fi + log_error "final ssh retry failed with status: " $exit_status log_error "os install time out" exit 1 fi diff --git a/deploy/deploy_parameter.sh b/deploy/deploy_parameter.sh index d8696ce8..9c0d5dc0 100755 --- a/deploy/deploy_parameter.sh +++ b/deploy/deploy_parameter.sh @@ -111,3 +111,11 @@ function process_input_para() echo $input_file } + +function check_input_para() +{ + python ${COMPASS_DIR}/util/check_valid.py "$DHA" "$NETWORK" + if [ $? -ne 0 ];then + exit 1 + fi +} diff --git a/deploy/launch.sh b/deploy/launch.sh index 488e0fd7..489c06d8 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -19,6 +19,7 @@ prepare_python_env source ${COMPASS_DIR}/util/log.sh source ${COMPASS_DIR}/deploy/deploy_parameter.sh source $(process_input_para $*) || exit 1 +check_input_para source $(process_default_para $*) || exit 1 source ${COMPASS_DIR}/deploy/conf/${FLAVOR}.conf source ${COMPASS_DIR}/deploy/conf/${TYPE}.conf diff --git a/deploy/network.sh b/deploy/network.sh index 46b8c023..b8bcd08b 100755 --- a/deploy/network.sh +++ b/deploy/network.sh @@ -17,6 +17,8 @@ function setup_bridge_net() net_name=$1 nic=$2 + sudo ifconfig $nic up + sudo virsh net-destroy $net_name sudo virsh net-undefine $net_name diff --git a/deploy/prepare.sh b/deploy/prepare.sh index c8aa49f9..d326bd5b 100755 --- a/deploy/prepare.sh +++ b/deploy/prepare.sh @@ -114,6 +114,10 @@ function _pre_env_setup() cd $WORK_DIR/prepare/jh_env_package tar -zxvf trusty-jh-ppa.tar.gz + if [[ ! -z /etc/apt/sources.list.d ]]; then + mv /etc/apt/sources.list.d /etc/apt/sources.list.d.bak + fi + if [[ -f /etc/apt/apt.conf ]]; then mv /etc/apt/apt.conf /etc/apt/apt.conf.bak fi @@ -158,6 +162,10 @@ EOF if [[ -f /etc/apt/apt.conf.bak ]]; then mv /etc/apt/apt.conf.bak /etc/apt/apt.conf fi + + if [[ ! -z /etc/apt/sources.list.d.bak ]]; then + mv /etc/apt/sources.list.d.bak /etc/apt/sources.list.d + fi } function _pre_pip_setup() |