diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2018-04-04 16:01:21 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-04-09 10:48:36 -0400 |
commit | 68a36eed8763e88ef0edfa5da82ca77a56ea373b (patch) | |
tree | 1168c486b788a4b102c615c182207822eecf9758 /meta-openstack/recipes-devtools/python | |
parent | 741ac89ba769bba01cbc0b769b908a568ab30c4d (diff) | |
download | meta-cloud-services-68a36eed8763e88ef0edfa5da82ca77a56ea373b.tar.gz |
python-neutron: Don't start the neutron services until init is done
Starting the various neutron services prior to completing the work as
part of neutron-init/neutron-init.service will only result in the
services spewing python errors. Disable the systemd services in the
recipe and have the neutron-init script enable these services for
subsequent boots.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutron/neutron-init | 15 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutron_git.bb | 7 |
2 files changed, 17 insertions, 5 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-neutron/neutron-init b/meta-openstack/recipes-devtools/python/python-neutron/neutron-init index fe98dcb..d0ae023 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron/neutron-init +++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-init | |||
@@ -44,8 +44,13 @@ sudo -u ${NEUTRON_USER} neutron-db-manage --config-file /etc/neutron/neutron.con | |||
44 | HOME=${ROOT_HOME} rabbitmqctl add_user openstack ${ADMIN_PASSWORD} | 44 | HOME=${ROOT_HOME} rabbitmqctl add_user openstack ${ADMIN_PASSWORD} |
45 | HOME=${ROOT_HOME} rabbitmqctl set_permissions openstack ".*" ".*" ".*" | 45 | HOME=${ROOT_HOME} rabbitmqctl set_permissions openstack ".*" ".*" ".*" |
46 | 46 | ||
47 | #systemctl restart nova-api | 47 | # enable and start the various services |
48 | systemctl restart neutron-server | 48 | systemctl enable neutron-server |
49 | systemctl restart neutron-linuxbridge-agent | 49 | systemctl enable neutron-linuxbridge-agent |
50 | systemctl restart neutron-dhcp-agent | 50 | systemctl enable neutron-dhcp-agent |
51 | systemctl restart neutron-metadata-agent | 51 | systemctl enable neutron-metadata-agent |
52 | |||
53 | systemctl start neutron-server | ||
54 | systemctl start neutron-linuxbridge-agent | ||
55 | systemctl start neutron-dhcp-agent | ||
56 | systemctl start neutron-metadata-agent | ||
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index edf9096..a054551 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb | |||
@@ -418,5 +418,12 @@ SYSTEMD_SERVICE_${SRCNAME}-linuxbridge-agent = "neutron-linuxbridge-agent.servic | |||
418 | SYSTEMD_SERVICE_${SRCNAME}-metadata-agent = "neutron-metadata-agent.service" | 418 | SYSTEMD_SERVICE_${SRCNAME}-metadata-agent = "neutron-metadata-agent.service" |
419 | SYSTEMD_SERVICE_${SRCNAME}-setup = "neutron-init.service" | 419 | SYSTEMD_SERVICE_${SRCNAME}-setup = "neutron-init.service" |
420 | 420 | ||
421 | # Disable unconfigured services | ||
422 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-server = "disable" | ||
423 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-dhcp-agent = "disable" | ||
424 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-linuxbridge-agent = "disable" | ||
425 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-metadata-agent = "disable" | ||
426 | |||
427 | |||
421 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" | 428 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" |
422 | MONITOR_SERVICE_${SRCNAME} = "neutron" | 429 | MONITOR_SERVICE_${SRCNAME} = "neutron" |