summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-04-27 13:11:52 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-05-08 09:55:43 (GMT)
commit70159902d45c6309bfafa8416b077d9706a98b4a (patch)
tree5477e33efba5809277283bc1ff225c49e842da29
parent3b69cc0b14b5089b6c8f49f7cd7bb2bf0d0b58ac (diff)
downloaddefinitions-70159902d45c6309bfafa8416b077d9706a98b4a.tar.gz
openstack: remove setup units from Wants section
This way it is possible to avoid running the setup script in subsequent boots, either by disabling the setup service using systemctl, or removing the respective configuration file from /etc/openstack/. Change-Id: I9945e40eaebbc160bb21ca46f10a8b6121f66267
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-api.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-server.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-db-setup.service1
12 files changed, 8 insertions, 12 deletions
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service
index 865b4b2..8c6f39a 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service
@@ -2,7 +2,6 @@
Description=Run ceilometer-db-setup Ansible scripts
ConditionPathExists=/etc/openstack/ceilometer.conf
After=postgres-server.service openstack-keystone.service openstack-keystone-setup.service openstack-ceilometer-config-setup.service
-Wants=postgres-server.service openstack-keystone.service
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-api.service b/openstack/usr/lib/systemd/system/openstack-cinder-api.service
index 2afb2d6..cf84a0e 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-api.service
@@ -2,7 +2,7 @@
Description=OpenStack Volume Service (code-named Cinder) API server
ConditionPathExists=/etc/cinder/cinder.conf
After=postgres-server-setup.service network-online.target openstack-cinder-db-setup.service openstack-cinder-config-setup.service
-Wants=postgres-server-setup.service network-online.target
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service b/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
index 1b9d43e..d0568c7 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
@@ -2,7 +2,6 @@
Description=Run cinder-db-setup Ansible scripts
ConditionPathExists=/etc/cinder/cinder.conf
After=postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone-setup.service
-Wants=postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone-setup.service
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service
index c7b3b5e..7a1d812 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service
@@ -2,7 +2,6 @@
Description=Run neutron-config-setup Ansible scripts
ConditionPathExists=/etc/openstack/neutron.conf
After=openstack-keystone-setup.service
-Wants=openstack-keystone-setup.service
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service
index 840d0be..9eff9ea 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service
@@ -2,7 +2,7 @@
Description=Run neutron-db-setup Ansible scripts
ConditionPathExists=/etc/openstack/neutron.conf
After=network-online.target postgres-server-setup.service openstack-keystone-setup.service openstack-neutron-config-setup.service
-Wants=network-online.target postgres-server-setup.service openstack-keystone-setup.service
+Wants=network-online.target
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service
index cd9ed9f..17a3775 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service
@@ -2,7 +2,7 @@
Description=Neutron DHCP Agent
ConditionPathExists=/etc/neutron/neutron.conf
After=network-online.target openstack-neutron-config-setup.service openstack-neutron-db-setup.service openstack-neutron-ovs-cleanup.service
-Wants=network-online.target openstack-neutron-config-setup.service
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service
index 1a6b592..2e96666 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service
@@ -2,7 +2,7 @@
Description=Neutron Layer 3 Agent
ConditionPathExists=/etc/neutron/neutron.conf
After=network-online.target openstack-neutron-config-setup.service openstack-neutron-db-setup.service openstack-neutron-ovs-cleanup.service
-Wants=network-online.target openstack-neutron-config-setup.service
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service
index c96fa3a..816abee 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service
@@ -2,7 +2,7 @@
Description=Neutron Metadata Plugin Agent
ConditionPathExists=/etc/neutron/neutron.conf
After=network-online.target openstack-neutron-config-setup.service openstack-neutron-db-setup.service
-Wants=network-online.target openstack-neutron-config-setup.service
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
index 386f50d..0a79483 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
@@ -2,8 +2,8 @@
Description=Neutron OVS cleanup
ConditionPathExists=/etc/neutron/neutron.conf
After=network-online.target openstack-neutron-config-setup.service openstack-neutron-db-setup.service openvswitch.service
-Wants=network-online.target openstack-neutron-config-setup.service
Before=openstack-neutron-plugin-openvswitch-agent.service
+Wants=network-online.target
ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
index ade1473..b162b11 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
@@ -2,7 +2,7 @@
Description=Neutron OpenvSwitch Plugin Agent
ConditionPathExists=/etc/neutron/neutron.conf
After=network-online.target openstack-neutron-config-setup.service openstack-neutron-db-setup.service
-Wants=network-online.target openstack-neutron-config-setup.service
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-server.service b/openstack/usr/lib/systemd/system/openstack-neutron-server.service
index 3c0e1bd..a43b5bb 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-server.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-server.service
@@ -1,8 +1,8 @@
[Unit]
Description=Neutron Api Server
ConditionPathExists=/etc/neutron/neutron.conf
-Wants=openstack-neutron-network-configuration-one-node.service network-online.target openstack-neutron-config-setup.service
After=openstack-neutron-network-configuration-one-node.service network-online.target openstack-neutron-config-setup.service openstack-neutron-db-setup.service
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service b/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
index a5bd196..ee40527 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
@@ -2,7 +2,6 @@
Description=Run nova-db-setup Ansible scripts
ConditionPathExists=/etc/openstack/neutron.conf
After=postgres-server-setup.service openstack-keystone-setup.service openstack-nova-config-setup.service
-Wants=postgres-server-setup.service openstack-keystone-setup.service
[Service]
Type=oneshot