openstack: add network-online dependency to some systemd units

To use keystone and postgres the network needs to be online.

Change-Id: Iaa0ed242b9cadca2bc8519cbc00e6cc9ea4745b4

9 files changed, 18 insertions, 9 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 2e3fa75f..7a785227 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Run ceilometer-db-setup Ansible scripts
 ConditionPathExists=/etc/openstack/ceilometer.conf
-After=postgres-server-setup.service openstack-keystone-setup.service openstack-ceilometer-config-setup.service
+After=network-online.target postgres-server-setup.service openstack-keystone-setup.service openstack-ceilometer-config-setup.service
+Wants=network-online.target
 
 [Service]
 Type=oneshot
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 cc99d0cb..0e42bbc0 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Run cinder-db-setup Ansible scripts
 ConditionPathExists=/etc/openstack/cinder.conf
-After=postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone-setup.service
+After=network-online.target postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone-setup.service
+Wants=network-online.target
 
 [Service]
 Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/openstack-glance-setup.service b/openstack/usr/lib/systemd/system/openstack-glance-setup.service
index b4ec3f02..95077873 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-setup.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Run glance-setup Ansible scripts
 ConditionPathExists=/etc/openstack/glance.conf
-After=local-fs.target openstack-keystone-setup.service postgres-server-setup.service
+After=local-fs.target network-online.target openstack-keystone-setup.service postgres-server-setup.service
+Wants=network-online.target
 
 [Service]
 ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/glance.yml
diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-setup.service b/openstack/usr/lib/systemd/system/openstack-ironic-setup.service
index 6d118f18..626c1fb6 100644
--- a/openstack/usr/lib/systemd/system/openstack-ironic-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-ironic-setup.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Run ironic-setup Ansible scripts
 ConditionPathExists=/etc/openstack/ironic.conf
-After=local-fs.target openstack-keystone-setup.service postgres-server-setup.service
+After=local-fs.target network-online.target openstack-keystone-setup.service postgres-server-setup.service
+Wants=network-online.target
 
 [Service]
 ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/ironic.yml
diff --git a/openstack/usr/lib/systemd/system/openstack-keystone-setup.service b/openstack/usr/lib/systemd/system/openstack-keystone-setup.service
index 2406513c..db9d0b2b 100644
--- a/openstack/usr/lib/systemd/system/openstack-keystone-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-keystone-setup.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Run keystone-setup Ansible scripts
-After=local-fs.target postgres-server-setup.service
 ConditionPathExists=/etc/openstack/keystone.conf
+After=local-fs.target network-online.target postgres-server-setup.service
+Wants=network-online.target
 
 [Service]
 # Oneshot, since others setup have to wait until this service finishes
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 7a1d812b..b74f44ab 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Run neutron-config-setup Ansible scripts
 ConditionPathExists=/etc/openstack/neutron.conf
-After=openstack-keystone-setup.service
+After=network-online.target openstack-keystone-setup.service
+Wants=network-online.target
 
 [Service]
 Type=oneshot
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 20c31db0..8e004327 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Run nova-db-setup Ansible scripts
 ConditionPathExists=/etc/openstack/nova.conf
-After=postgres-server-setup.service openstack-keystone-setup.service openstack-nova-config-setup.service
+After=network-online.target postgres-server-setup.service openstack-keystone-setup.service openstack-nova-config-setup.service
+Wants=network-online.target
 
 [Service]
 Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/swift-controller-setup.service b/openstack/usr/lib/systemd/system/swift-controller-setup.service
index ac5cc240..ccfbcbe6 100644
--- a/openstack/usr/lib/systemd/system/swift-controller-setup.service
+++ b/openstack/usr/lib/systemd/system/swift-controller-setup.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Run swift-controller-setup (once)
-After=local-fs.target postgres-server-setup.service openstack-keystone-setup.service
+After=local-fs.target 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/swift-proxy.service b/openstack/usr/lib/systemd/system/swift-proxy.service
index 0b98634a..37354364 100644
--- a/openstack/usr/lib/systemd/system/swift-proxy.service
+++ b/openstack/usr/lib/systemd/system/swift-proxy.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenStack Swift Proxy Server
-After=syslog.target network.target memcached.service openstack-keystone-setup.service swift-controller-setup.service
+After=syslog.target network-online.target network.target memcached.service openstack-keystone-setup.service swift-controller-setup.service
+Wants=network-online.target
 
 [Service]
 Type=forking