summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-01-29 01:17:50 +0000
committerGerrit Code Review <review@openstack.org>2018-01-29 01:17:50 +0000
commit3b288be3f756f0ccd7a739cb20013ec982d60554 (patch)
tree4757aeab0d2f77b823b8e71517266b07bae4f3c3
parent8861cedb988e21bee2d33c3437ad4a9453fd1747 (diff)
parent293e2acea33138ff73fa8dbad0abb927b60fde64 (diff)
Merge "disable services when running unstack.sh properly"
-rw-r--r--devstack/plugin.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 5943e31..92fd2ae 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -181,7 +181,6 @@ function build_spp_primary_service() {
181 iniset -sudo $unitfile "Unit" "Description" "Devstack $service" 181 iniset -sudo $unitfile "Unit" "Description" "Devstack $service"
182 iniset -sudo $unitfile "Service" "User" "root" 182 iniset -sudo $unitfile "Service" "User" "root"
183 iniset -sudo $unitfile "Service" "ExecStart" "$PRIMARY_CMD" 183 iniset -sudo $unitfile "Service" "ExecStart" "$PRIMARY_CMD"
184 iniset -sudo $unitfile "Install" "WantedBy" "multi-user.target"
185} 184}
186 185
187function build_spp_vf_service() { 186function build_spp_vf_service() {
@@ -196,8 +195,6 @@ function build_spp_vf_service() {
196 iniset -sudo $unitfile "Unit" "Description" "Devstack $service" 195 iniset -sudo $unitfile "Unit" "Description" "Devstack $service"
197 iniset -sudo $unitfile "Service" "User" "root" 196 iniset -sudo $unitfile "Service" "User" "root"
198 iniset -sudo $unitfile "Service" "ExecStart" "$SEC_CMD" 197 iniset -sudo $unitfile "Service" "ExecStart" "$SEC_CMD"
199 #iniset -sudo $unitfile "Service" "Restart" "on-failure"
200 iniset -sudo $unitfile "Install" "WantedBy" "multi-user.target"
201} 198}
202 199
203function build_systemd_services() { 200function build_systemd_services() {
@@ -221,7 +218,7 @@ function build_systemd_services() {
221} 218}
222 219
223function stop_systemd_services() { 220function stop_systemd_services() {
224 $SYSTEMCTL stop devstack@q-spp-agt.service 221 stop_process q-spp-agt
225 MAPPINGS=${DPDK_PORT_MAPPINGS//,/ } 222 MAPPINGS=${DPDK_PORT_MAPPINGS//,/ }
226 ARRAY=( $MAPPINGS ) 223 ARRAY=( $MAPPINGS )
227 for ((i=1; i<=${#ARRAY[@]}; i++)); do 224 for ((i=1; i<=${#ARRAY[@]}; i++)); do