Merge "Reduce gate resource usage"

2 files changed, 40 insertions, 9 deletions

diff --git a/kolla/common/config.py b/kolla/common/config.py
index eb108160c..b43163ccd 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -45,10 +45,9 @@ _PROFILE_OPTS = [
                          'openvswitch', 'rabbitmq', 'rsyslog'],
                 help='Default images'),
     cfg.ListOpt('gate',
-                default=['ceph', 'cinder', 'glance', 'haproxy', 'heat',
-                         'horizon', 'keepalived', 'keystone', 'kolla-toolbox',
-                         'mariadb', 'memcached', 'neutron', 'nova',
-                         'openvswitch', 'rabbitmq', 'rsyslog'],
+                default=['glance', 'haproxy', 'keepalived', 'keystone',
+                         'kolla-toolbox', 'mariadb', 'memcached', 'neutron',
+                         'nova', 'openvswitch', 'rabbitmq', 'rsyslog'],
                 help='Gate images'),
     cfg.ListOpt('mesos',
                 default=['chronos', 'marathon', 'mesos-master', 'mesos-slave',
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index 0b80c6ccf..74d5b617a 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -5,6 +5,9 @@ set -o errexit
 
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
+export KOLLA_BASE=$1
+export KOLLA_TYPE=$2
+
 function check_failure {
     docker ps -a
     failed_containers=$(docker ps -a --format "{{.Names}}" --filter status=exited)
@@ -13,24 +16,53 @@ function check_failure {
         docker logs --tail all ${failed}
     done
 
+    journalctl --no-pager -u docker.service || :
+    cat /var/log/upstart/docker.log || :
+
     if [[ -n ${failed_containers} ]]; then
         echo 'FAILED'
         exit 1
     fi
 }
 
-trap check_failure EXIT
+function write_configs {
+    mkdir -p /etc/kolla/config
 
-# Populate globals.yml
-cat << EOF > /etc/kolla/globals.yml
+    cat << EOF > /etc/kolla/globals.yml
 ---
-kolla_base_distro: "$1"
-kolla_install_type: "$2"
+kolla_base_distro: "${KOLLA_BASE}"
+kolla_install_type: "${KOLLA_TYPE}"
 kolla_internal_address: "169.254.169.10"
 docker_restart_policy: "never"
 network_interface: "eth0"
 neutron_external_interface: "fake_interface"
+enable_horizon: "no"
+enable_heat: "no"
+EOF
+
+    cat << EOF > /etc/kolla/config/nova.conf
+[DEFAULT]
+osapi_compute_workers = 1
+
+[conductor]
+workers = 1
+EOF
+
+    cat << EOF > /etc/kolla/config/glance.conf
+[DEFAULT]
+workers = 1
+EOF
+
+    cat << EOF > /etc/kolla/config/neutron.conf
+[DEFAULT]
+api_workers = 1
+metadata_workers = 1
 EOF
+}
+
+trap check_failure EXIT
+
+write_configs
 
 # Create dummy interface for neutron
 ip l a fake_interface type dummy