From 90bbff7e6e11dc8f793c8551bf9e81ce519f0f30 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Wed, 20 Apr 2016 15:51:19 -0400
Subject: [PATCH] Don't use os-cloud-config/common-venv elements

Moves the os-cloud-config installation to be handled by puppet instead
of the element. Also removes usage of the common-venv element since it
was only ever needed when installing other elements from source.

blueprint undercloud-elements
Change-Id: I9488cebbb479c269901e9b310a1208b6d5ed9e76
---
 elements/puppet-stack-config/puppet-stack-config.pp | 1 +
 json-files/centos-7-undercloud-packages.json        | 2 --
 json-files/rhel-7-undercloud-packages.json          | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 6c802061a..4636df2c2 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -545,3 +545,4 @@ if str2bool(hiera('enable_monitoring', true)) {
 package{'firewalld':
   ensure => 'absent',
 }
+package{'os-cloud-config': }
diff --git a/json-files/centos-7-undercloud-packages.json b/json-files/centos-7-undercloud-packages.json
index bdc16c4bf..13ab6c5e5 100644
--- a/json-files/centos-7-undercloud-packages.json
+++ b/json-files/centos-7-undercloud-packages.json
@@ -7,13 +7,11 @@
       "redhat-common",
       "undercloud-install",
       "undercloud-stack-config",
-      "common-venv",
       "undercloud-post-config",
       "enable-packages-install",
       "element-manifest",
       "ironic-conductor",
       "ipxe",
-      "os-cloud-config",
       "os-net-config",
       "puppet-stack-config",
       "selinux-permissive",
diff --git a/json-files/rhel-7-undercloud-packages.json b/json-files/rhel-7-undercloud-packages.json
index 30d791a7e..ecd0c9199 100644
--- a/json-files/rhel-7-undercloud-packages.json
+++ b/json-files/rhel-7-undercloud-packages.json
@@ -7,13 +7,11 @@
       "redhat-common",
       "undercloud-install",
       "undercloud-stack-config",
-      "common-venv",
       "undercloud-post-config",
       "enable-packages-install",
       "element-manifest",
       "ironic-conductor",
       "ipxe",
-      "os-cloud-config",
       "os-net-config",
       "puppet-stack-config"
     ],