summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/PR_revision.log5
-rwxr-xr-xci/deploy.sh9
2 files changed, 13 insertions, 1 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
new file mode 100644
index 00000000..edd42986
--- /dev/null
+++ b/ci/PR_revision.log
@@ -0,0 +1,5 @@
+#Dummy file used to store history of PRs
+#Note this is only needed for triggering commits with no code change in
+#Apex, but changes do occur in opnfv-tht
+#PR number, PR Title
+14,Adds ODL DLUX GUI to L2/L3 deployments
diff --git a/ci/deploy.sh b/ci/deploy.sh
index b0b70ddb..2853f188 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -372,7 +372,7 @@ function setup_undercloud_vm {
if [[ $enabled_network_list =~ "public_network" ]]; then
undercloud_nets+=" public_network"
fi
- define_vm undercloud hd 30 "$undercloud_nets" 4 10240
+ define_vm undercloud hd 30 "$undercloud_nets" 4 12288
### this doesn't work for some reason I was getting hangup events so using cp instead
#virsh vol-upload --pool default --vol undercloud.qcow2 --file $CONFIG/stack/undercloud.qcow2
@@ -739,6 +739,11 @@ sleep 30
sudo systemctl restart openstack-glance-api
sudo systemctl restart openstack-nova-conductor
sudo systemctl restart openstack-nova-compute
+
+sudo sed -i '/num_engine_workers/c\num_engine_workers = 2' /etc/heat/heat.conf
+sudo sed -i '/#workers\s=/c\workers = 2' /etc/heat/heat.conf
+sudo systemctl restart openstack-heat-engine
+sudo systemctl restart openstack-heat-api
EOI
# WORKAROUND: must restart the above services to fix sync problem with nova compute manager
# TODO: revisit and file a bug if necessary. This should eventually be removed
@@ -834,6 +839,8 @@ function undercloud_prep_overcloud_deploy {
if [[ ! "$virtual" == "TRUE" ]]; then
DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
+ else
+ DEPLOY_OPTIONS+=" -e virtual-environment.yaml"
fi
DEPLOY_OPTIONS+=" -e opnfv-environment.yaml"