From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Wed, 27 Feb 2019 11:51:10 +0000 (+0400)
Subject: Use cloud-init services as anchor for jenkins-agent service
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1c38f20c7d78515e8b499f028c81478ac4555607;p=tools%2Fsustaining.git

Use cloud-init services as anchor for jenkins-agent service

Change-Id: Ic3f613f4ab85732a42bccbed286b766a27b08834
---

diff --git a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
index 56073df..6e38239 100644
--- a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
@@ -67,8 +67,8 @@ chmod +x /home/jenkins/launch_jenkins_agent.sh
 cat > /etc/systemd/system/jenkins-swarm-agent.service << EOF
 [Unit]
 Description=jenkins-swarm-agent
-Wants=network-online.target
-After=network-online.target
+Wants=cloud-final.target
+After=cloud-final.target
 
 [Service]
 User=jenkins
@@ -77,7 +77,7 @@ Type=simple
 ExecStart=/home/jenkins/launch_jenkins_agent.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=cloud-init.target
 EOF
 systemctl enable jenkins-swarm-agent
 
diff --git a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
index a3596ca..f0ba5eb 100644
--- a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
@@ -108,8 +108,8 @@ chmod +x /home/jenkins/launch_jenkins_agent.sh
 cat > /etc/systemd/system/jenkins-swarm-agent.service << EOF
 [Unit]
 Description=jenkins-swarm-agent
-Wants=network-online.target
-After=network-online.target
+Wants=cloud-final.target
+After=cloud-final.target
 
 [Service]
 User=jenkins
@@ -118,7 +118,7 @@ Type=simple
 ExecStart=/home/jenkins/launch_jenkins_agent.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=cloud-init.target
 EOF
 systemctl enable jenkins-swarm-agent