From d3c0f202f251a7e56e76b4d5d5fd0e076f3285b2 Mon Sep 17 00:00:00 2001 From: Omer Anson Date: Wed, 14 Jun 2017 20:03:16 +0300 Subject: [PATCH] Gate fixes: Define AGENT_BINARY to true. Disable horizon in gate The two commits are squashed since they are both gate fixes (And can't be merged otherwise) Gate fix: Define AGENT_BINARY to true Following [1] , devstack defines all processes, even disabled ones. This failes on q-agt in Dragonflow, since it is not defined (In Dragonflow, it doesn't exist). Setting AGENT_BINARY to true works around this issue, since true won't fail, but won't actually do anything. [1] https://review.openstack.org/#/c/469390 Change-Id: Iea4c38c3708c058667040cca3904d708d785f48e Disable horizon in gate We don't actually test horizon. Following [1], it should be removed. [1] https://review.openstack.org/#/c/474283/ Change-Id: If7d1148380848c5ec9270dcccc3782edb1027812 --- devstack/devstackgaterc | 2 +- devstack/devstackgaterc-zmq | 2 +- devstack/override-defaults | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/devstack/devstackgaterc b/devstack/devstackgaterc index 9a1fee3ad..4532617a1 100644 --- a/devstack/devstackgaterc +++ b/devstack/devstackgaterc @@ -17,7 +17,7 @@ # http://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml # -export OVERRIDE_ENABLED_SERVICES=key,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,c-sch,c-api,c-vol,horizon,rabbit,mysql,dstat,df-controller,df-redis,df-redis-server,q-svc,df-l3-agent,df-metadata,q-qos,placement-api,df-bgp,q-trunk +export OVERRIDE_ENABLED_SERVICES=key,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,c-sch,c-api,c-vol,rabbit,mysql,dstat,df-controller,df-redis,df-redis-server,q-svc,df-l3-agent,df-metadata,q-qos,placement-api,df-bgp,q-trunk export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_REDIS_PUBSUB=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_RUNNING_IN_GATE=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"EXTERNAL_HOST_IP=172.24.4.100" diff --git a/devstack/devstackgaterc-zmq b/devstack/devstackgaterc-zmq index a4e0047a0..ac0b7f9a3 100644 --- a/devstack/devstackgaterc-zmq +++ b/devstack/devstackgaterc-zmq @@ -17,7 +17,7 @@ # http://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml # -export OVERRIDE_ENABLED_SERVICES=key,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,c-sch,c-api,c-vol,horizon,rabbit,mysql,dstat,df-controller,df-etcd,df-etcd-server,df-zmq-publisher-service,q-svc,df-l3-agent,df-metadata,q-qos,placement-api,q-trunk +export OVERRIDE_ENABLED_SERVICES=key,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,c-sch,c-api,c-vol,rabbit,mysql,dstat,df-controller,df-etcd,df-etcd-server,df-zmq-publisher-service,q-svc,df-l3-agent,df-metadata,q-qos,placement-api,q-trunk export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_PUB_SUB=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_SELECTIVE_TOPO_DIST=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_PORT_STATUS_NOTIFIER=False" diff --git a/devstack/override-defaults b/devstack/override-defaults index 10ffdfd15..4577be1dd 100644 --- a/devstack/override-defaults +++ b/devstack/override-defaults @@ -14,6 +14,10 @@ function neutron_plugin_install_agent_packages { : } +# Workaround for devstack/systemd, which will try to define q-agt even though +# it's disabled. +AGENT_BINARY=$(which true) + if is_service_enabled df-l3-agent ; then AGENT_L3_BINARY=${AGENT_L3_BINARY:-"$(get_python_exec_prefix)/df-l3-agent"} enable_service q-l3