summaryrefslogtreecommitdiff
path: root/openstack
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-04-27 13:11:52 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-05-08 09:55:43 +0000
commit70159902d45c6309bfafa8416b077d9706a98b4a (patch)
tree5477e33efba5809277283bc1ff225c49e842da29 /openstack
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
Diffstat (limited to 'openstack')
-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 865b4b2c..8c6f39ab 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 2afb2d6e..cf84a0e0 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 1b9d43e0..d0568c70 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 c7b3b5e0..7a1d812b 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 840d0bee..9eff9ea5 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 cd9ed9fe..17a37750 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 1a6b5928..2e966666 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 c96fa3a2..816abeed 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 386f50dd..0a794838 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 ade14733..b162b11c 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 3c0e1bda..a43b5bb8 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 a5bd1969..ee405279 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