From e1bac00346340cbb983cc7077ef5dea3191ab2e2 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 18 Sep 2017 08:39:19 +0300
Subject: [PATCH] Remove cloud-init update bits

For TLS everywhere, a newer cloud-init package was needed. This is
already available in CentOS 7.4, so we don't need to update the package
if we're using this version.

Change-Id: I7b7a46e2fbba348e467304e2323cdd79d2efb3eb
Closes-Bug: #1717846
---
 roles/overcloud-prep-images/tasks/main.yml    |  3 ---
 .../tasks/update-cloud-init.yml               | 21 -------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 roles/overcloud-prep-images/tasks/update-cloud-init.yml

diff --git a/roles/overcloud-prep-images/tasks/main.yml b/roles/overcloud-prep-images/tasks/main.yml
index d933e27de..6c0696214 100644
--- a/roles/overcloud-prep-images/tasks/main.yml
+++ b/roles/overcloud-prep-images/tasks/main.yml
@@ -1,6 +1,3 @@
-- include: update-cloud-init.yml
-  when: enable_tls_everywhere|bool
-
 - include: create-scripts.yml
   tags:
     - undercloud-scripts
diff --git a/roles/overcloud-prep-images/tasks/update-cloud-init.yml b/roles/overcloud-prep-images/tasks/update-cloud-init.yml
deleted file mode 100644
index fdaddd64b..000000000
--- a/roles/overcloud-prep-images/tasks/update-cloud-init.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Updates the cloud-init package in the overcloud images, since it's needed for
-# novajoin/TlS-everywhere to properly work. This is currently a workaround
-# until the fix for https://bugzilla.redhat.com/show_bug.cgi?id=1420946 is
-# available in CentOS.
-
-- name: Fetch cloud-init package
-  get_url:
-    url: http://66.187.229.139/test/cloud-init-0.7.6-9.el7.x86_64.rpm
-    dest: "{{ working_dir }}/cloud-init-0.7.6-9.el7.x86_64.rpm"
-    mode: 0755
-
-- name: Update cloud-init from the overcloud-full image
-  include_role:
-    name: modify-image
-  vars:
-    image_to_modify: "{{ working_dir }}/overcloud-full.qcow2"
-    modify_image_upload_files:
-      - src: "{{ working_dir }}/cloud-init-0.7.6-9.el7.x86_64.rpm"
-        dest: /root/cloud-init-0.7.6-9.el7.x86_64.rpm
-    modify_image_install_packages:
-      - '/root/cloud-init-0.7.6-9.el7.x86_64.rpm'