podman: Add systemd dependency on network.target

When using podman, the systemd unit scripts don't have a dependency
on the network. So we're not sure that the network is up and running
when the containers are starting.
With docker this behaviour is already handled because the systemd
unit scripts depend on docker service which is started after the
network.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit f49090df7ef82419c69dfd7a22250a79c17de42f)

diff --git a/roles/ceph-grafana/templates/grafana-server.service.j2 b/roles/ceph-grafana/templates/grafana-server.service.j2
index 530c9b9b4c9387f618c545e79ba3008c6debe4ee..144819b9efcb24118333aff3e07c3ddfe34f5142 100644 (file)
--- a/roles/ceph-grafana/templates/grafana-server.service.j2
+++ b/roles/ceph-grafana/templates/grafana-server.service.j2
@@ -4,6 +4,8 @@
 Description=grafana-server
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2 b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
index 9b556f3911434b8fb49a499f2e1f9258844c8c43..62efd538819bf2c60cdcf88a0550b993bfce37be 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
@@ -2,6 +2,8 @@
 Description=RBD Target API Service
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2 b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
index a0866459326d55016245f13bb95934ad6a1351db..af1154d35b76345d23994771c66a2fc3b345add6 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
@@ -2,6 +2,8 @@
 Description=RBD Target Gateway Service
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
index 83a1aa58a94492ef2b882137557c2dbb8ce7f38e..e22b7078bdeea9f7ac286ca9a29bb7ca9359fc23 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
+++ b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
@@ -2,6 +2,8 @@
 Description=TCMU Runner
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2
index 5efc7b77510e173ac456e2651eecfe7949468c2b..f35e9fea597e19d2183b82e517d635cafba45f54 100644 (file)
--- a/roles/ceph-mds/templates/ceph-mds.service.j2
+++ b/roles/ceph-mds/templates/ceph-mds.service.j2
@@ -2,6 +2,8 @@
 Description=Ceph MDS
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 {% set cpu_limit = ansible_processor_vcpus|int if ceph_mds_docker_cpu_limit|int > ansible_processor_vcpus|int else ceph_mds_docker_cpu_limit|int %}
 

diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2
index c198c55f271b33cd74b47344fbca4d87d8586d06..e2d52ce4b5421d81c85c5f9581cf7ff8dcfd8497 100644 (file)
--- a/roles/ceph-mgr/templates/ceph-mgr.service.j2
+++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2
@@ -2,6 +2,8 @@
 Description=Ceph Manager
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2
index 255b355cfa29830acaac7bc89076bb3d0c9c27fe..b19cf85b943cfc31e6e0cd2b871766a908bf2fd1 100644 (file)
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -2,6 +2,8 @@
 Description=Ceph Monitor
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-nfs/templates/ceph-nfs.service.j2 b/roles/ceph-nfs/templates/ceph-nfs.service.j2
index a22b472dcea234ec527cdd53108ba4b2fe4f10ce..740b6b6223a7ae676af2399938cc0e9343f366e9 100644 (file)
--- a/roles/ceph-nfs/templates/ceph-nfs.service.j2
+++ b/roles/ceph-nfs/templates/ceph-nfs.service.j2
@@ -3,6 +3,8 @@ Description=NFS-Ganesha file server
 Documentation=http://github.com/nfs-ganesha/nfs-ganesha/wiki
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-node-exporter/templates/node_exporter.service.j2 b/roles/ceph-node-exporter/templates/node_exporter.service.j2
index 7d89a119e835bb24893f53670e075e817ed15ce5..b1a7fd574f9f568df828f0cbf59170824006ab72 100644 (file)
--- a/roles/ceph-node-exporter/templates/node_exporter.service.j2
+++ b/roles/ceph-node-exporter/templates/node_exporter.service.j2
@@ -4,6 +4,8 @@
 Description=Node Exporter
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2
index ea67df29b97e6ff25aa3990a0f4a6adfe0ec8055..23a344d3300372a73c84fa442c2a1d8354beb303 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd.service.j2
+++ b/roles/ceph-osd/templates/ceph-osd.service.j2
@@ -3,6 +3,8 @@
 Description=Ceph OSD
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-prometheus/templates/alertmanager.service.j2 b/roles/ceph-prometheus/templates/alertmanager.service.j2
index 207a53e6e934663079c59d1931df78641c9e8e3d..e268bef90a4e5333a2bbae8782a0108407a75a7e 100644 (file)
--- a/roles/ceph-prometheus/templates/alertmanager.service.j2
+++ b/roles/ceph-prometheus/templates/alertmanager.service.j2
@@ -4,6 +4,8 @@
 Description=alertmanager
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-prometheus/templates/prometheus.service.j2 b/roles/ceph-prometheus/templates/prometheus.service.j2
index 0ae01940bb00c9c9d622466d194fabebda0badcb..f0cbb9558c953e175fbf6a2c818bc30923b7c527 100644 (file)
--- a/roles/ceph-prometheus/templates/prometheus.service.j2
+++ b/roles/ceph-prometheus/templates/prometheus.service.j2
@@ -4,6 +4,8 @@
 Description=prometheus
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
index 48b94f911502d10deb9b83313a62edb31f346abd..23eeb02e6260ed30730687fe3e81eb0c74bad732 100644 (file)
--- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
+++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
@@ -2,6 +2,8 @@
 Description=Ceph RBD mirror
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 
 [Service]

diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
index 3ba88a536cd2a1fa5334ec73617b9cb14f4ca928..4e4730a7d240e1e8075791a47bcaa5ffe95806af 100644 (file)
--- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2
+++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
@@ -2,6 +2,8 @@
 Description=Ceph RGW
 {% if container_binary == 'docker' %}
 After=docker.service
+{% else %}
+After=network.target
 {% endif %}
 {% set cpu_limit = ansible_processor_vcpus|int if ceph_rgw_docker_cpu_limit|int > ansible_processor_vcpus|int else ceph_rgw_docker_cpu_limit|int %}