diff options
-rwxr-xr-x | ci/build_rpm/build_rpms.sh | 4 | ||||
-rwxr-xr-x | ci/build_rpm/build_rpms_docker.sh | 9 | ||||
-rwxr-xr-x | ci/deploy/deploy.sh | 7 | ||||
-rwxr-xr-x | deploy/check_openstack_progress.sh | 2 | ||||
-rw-r--r-- | deploy/daisy.conf | 5 | ||||
-rw-r--r-- | deploy/prepare/execute.py | 8 | ||||
-rw-r--r-- | templates/physical_environment/vms/daisy.xml | 4 | ||||
-rw-r--r-- | templates/virtual_environment/vms/all_in_one.xml | 4 | ||||
-rw-r--r-- | templates/virtual_environment/vms/computer01.xml | 4 | ||||
-rw-r--r-- | templates/virtual_environment/vms/computer02.xml | 4 | ||||
-rw-r--r-- | templates/virtual_environment/vms/controller01.xml | 4 | ||||
-rw-r--r-- | templates/virtual_environment/vms/controller02.xml | 4 | ||||
-rw-r--r-- | templates/virtual_environment/vms/controller03.xml | 4 | ||||
-rw-r--r-- | templates/virtual_environment/vms/daisy.xml | 4 | ||||
-rwxr-xr-x | tools/daisy-img-modify.sh | 4 |
15 files changed, 34 insertions, 37 deletions
diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh index db5a42e9..e4b0cae9 100755 --- a/ci/build_rpm/build_rpms.sh +++ b/ci/build_rpm/build_rpms.sh @@ -36,9 +36,9 @@ function cleanup_container { ${containers_to_kill} | egrep -v '(^\s*$)' | sort | uniq) echo "Stopping containers... $containers_to_kill" - (sudo docker stop -t 2 ${containers_to_kill} 2>&1) > /dev/null + sudo docker stop -t 2 ${containers_to_kill} echo "Removing containers... $containers_to_kill" - (sudo docker rm -v -f ${containers_to_kill} 2>&1) > /dev/null + sudo docker rm -v -f ${containers_to_kill} if [[ ! -z "$volumes_to_remove" ]]; then echo "Removing volumes... $volumes_to_remove" diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh index caeb005b..b005a243 100755 --- a/ci/build_rpm/build_rpms_docker.sh +++ b/ci/build_rpm/build_rpms_docker.sh @@ -14,6 +14,7 @@ rpm_build_dir=/opt/daisy4nfv rpm_output_dir=$rpm_build_dir/build_output tmp_rpm_build_dir=/home/cache/daisy4nfv +DAISYCORE_REPO="https://git.openstack.org/openstack/daisycloud-core" DAISYCORE_TAG= if [[ -d $tmp_rpm_build_dir ]]; then @@ -36,12 +37,10 @@ do cnt=$[cnt + 1] echo -e "\n\n\n*** Starting build attempt # $cnt" - git clone https://git.openstack.org/openstack/daisycloud-core - if [[ ! -z "$DAISYCORE_TAG" ]]; then - pushd daisycloud-core - git checkout $DAISYCORE_TAG - popd + git clone $DAISYCORE_REPO --branch $DAISYCORE_TAG --depth 1 + else + git clone $DAISYCORE_REPO --depth 1 fi cp $rpm_build_dir/code/makefile_patch.sh daisycloud-core/tools/setup diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 75d30047..cc759149 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -269,7 +269,10 @@ else virsh define $BMDEPLOY_DAISY_SERVER_VM virsh start daisy fi -sleep 20 +#wait for the daisy1 network start finished for execute trustme.sh +#here sleep 40 just needed in Dell blade server +#for E9000 blade server we only have to sleep 20 +sleep 40 echo "====== install daisy ======" $DEPLOY_PATH/trustme.sh $DAISY_IP $DAISY_PASSWD @@ -293,8 +296,6 @@ scp $WORKSPACE/known_hosts root@$DAISY_IP:/root/.ssh/ if [ $IS_BARE == 0 ];then echo "====== add relate config of kolla ======" - ssh $SSH_PARAS $DAISY_IP "mkdir -p /etc/kolla/config/nova" - ssh $SSH_PARAS $DAISY_IP "echo -e '[libvirt]\nvirt_type=qemu\ncpu_mode=none' >> /etc/kolla/config/nova/nova-compute.conf" ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK" fi diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh index f0ab1e90..1f150896 100755 --- a/deploy/check_openstack_progress.sh +++ b/deploy/check_openstack_progress.sh @@ -8,7 +8,7 @@ OPTIONS: -n target node numbers EXAMPLE: - sudo `basename $0` -d 1 -n 5 + sudo `basename $0` -n 5 EOF } diff --git a/deploy/daisy.conf b/deploy/daisy.conf index f8ce0534..d9659dbb 100644 --- a/deploy/daisy.conf +++ b/deploy/daisy.conf @@ -32,3 +32,8 @@ client_ip_begin=99.99.1.50 #The end value of PXE client ip range client_ip_end=99.99.1.150 + +[multicast] +#enabled multicast or not. +daisy_conf_mcast_enabled=False + diff --git a/deploy/prepare/execute.py b/deploy/prepare/execute.py index 1e88755c..67c31b1b 100644 --- a/deploy/prepare/execute.py +++ b/deploy/prepare/execute.py @@ -38,6 +38,13 @@ def _config_service(service, subs): return _wrap +@_config_service('nova', ['compute']) +def _set_default_compute(): + return '[libvirt]\n' \ + 'virt_type=qemu\n' \ + 'cpu_mode=none\n' + + @_config_service('nova', ['api']) def _set_default_floating_pool(network_file): xnet = NetworkConfig(network_file=network_file).ext_network_name @@ -59,6 +66,7 @@ def main(): required=True, help='network configuration file') args = parser.parse_args() + _set_default_compute() _set_default_floating_pool(args.network_file) _set_trusts_auth() diff --git a/templates/physical_environment/vms/daisy.xml b/templates/physical_environment/vms/daisy.xml index 574669bf..552addb5 100644 --- a/templates/physical_environment/vms/daisy.xml +++ b/templates/physical_environment/vms/daisy.xml @@ -15,9 +15,7 @@ <acpi/>
<apic/>
</features>
- <cpu mode='custom' match='exact'>
- <model fallback='allow'>IvyBridge</model>
- </cpu>
+ <cpu mode="host-model"/>
<clock offset='utc'>
<timer name='rtc' tickpolicy='catchup'/>
<timer name='pit' tickpolicy='delay'/>
diff --git a/templates/virtual_environment/vms/all_in_one.xml b/templates/virtual_environment/vms/all_in_one.xml index 75caed25..4d08a68b 100644 --- a/templates/virtual_environment/vms/all_in_one.xml +++ b/templates/virtual_environment/vms/all_in_one.xml @@ -15,9 +15,7 @@ <acpi/> <apic/> </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>IvyBridge</model> - </cpu> + <cpu mode="host-model"/> <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> diff --git a/templates/virtual_environment/vms/computer01.xml b/templates/virtual_environment/vms/computer01.xml index 323f741d..00d27182 100644 --- a/templates/virtual_environment/vms/computer01.xml +++ b/templates/virtual_environment/vms/computer01.xml @@ -15,9 +15,7 @@ <acpi/> <apic/> </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>IvyBridge</model> - </cpu> + <cpu mode="host-model"/> <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> diff --git a/templates/virtual_environment/vms/computer02.xml b/templates/virtual_environment/vms/computer02.xml index b8a4eac2..b2b48bf0 100644 --- a/templates/virtual_environment/vms/computer02.xml +++ b/templates/virtual_environment/vms/computer02.xml @@ -15,9 +15,7 @@ <acpi/> <apic/> </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>IvyBridge</model> - </cpu> + <cpu mode="host-model"/> <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> diff --git a/templates/virtual_environment/vms/controller01.xml b/templates/virtual_environment/vms/controller01.xml index b29b45c0..fbf14f16 100644 --- a/templates/virtual_environment/vms/controller01.xml +++ b/templates/virtual_environment/vms/controller01.xml @@ -15,9 +15,7 @@ <acpi/> <apic/> </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>IvyBridge</model> - </cpu> + <cpu mode="host-model"/> <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> diff --git a/templates/virtual_environment/vms/controller02.xml b/templates/virtual_environment/vms/controller02.xml index b49b9543..931c1f28 100644 --- a/templates/virtual_environment/vms/controller02.xml +++ b/templates/virtual_environment/vms/controller02.xml @@ -15,9 +15,7 @@ <acpi/> <apic/> </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>IvyBridge</model> - </cpu> + <cpu mode="host-model"/> <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> diff --git a/templates/virtual_environment/vms/controller03.xml b/templates/virtual_environment/vms/controller03.xml index f35f7ef8..8f1c0f02 100644 --- a/templates/virtual_environment/vms/controller03.xml +++ b/templates/virtual_environment/vms/controller03.xml @@ -15,9 +15,7 @@ <acpi/> <apic/> </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>IvyBridge</model> - </cpu> + <cpu mode="host-model"/> <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> diff --git a/templates/virtual_environment/vms/daisy.xml b/templates/virtual_environment/vms/daisy.xml index c95219b8..98703c7a 100644 --- a/templates/virtual_environment/vms/daisy.xml +++ b/templates/virtual_environment/vms/daisy.xml @@ -14,9 +14,7 @@ <acpi/> <apic/> </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>IvyBridge</model> - </cpu> + <cpu mode="host-model"/> <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> diff --git a/tools/daisy-img-modify.sh b/tools/daisy-img-modify.sh index 90910a14..aad29949 100755 --- a/tools/daisy-img-modify.sh +++ b/tools/daisy-img-modify.sh @@ -157,6 +157,7 @@ resize() { # resize the image qemu-img resize $raw_imgfile ${img_size}G qemu-img info $raw_imgfile + losetup --find --show $raw_imgfile loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ') kpartx -av $raw_imgfile sleep 2 @@ -170,9 +171,8 @@ resize() { # mount image setup() { mkdir -p $mountdir - + losetup --find --show $raw_imgfile loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ') - kpartx -av $raw_imgfile sleep 2 dmsetup ls |