From f893478d915e4fd875c7178f136b1bcef0ef59af Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Tue, 15 Apr 2014 07:32:23 -0400
Subject: [PATCH] Make enabling the RDO icehouse repo a manual step
---
README-packages.md | 3 ++-
README-source.md | 1 +
elements/undercloud-install/pre-install.d/00-icehouse-repo | 5 -----
3 files changed, 3 insertions(+), 6 deletions(-)
delete mode 100755 elements/undercloud-install/pre-install.d/00-icehouse-repo
diff --git a/README-packages.md b/README-packages.md
index b62ca3e36..e1e67a93d 100644
--- a/README-packages.md
+++ b/README-packages.md
@@ -5,9 +5,10 @@ The commands in these instructions should be applied to the baremetal machine or
an undercloud. It helps when setting up the undercloud to use a user with passwordless sudo enabled. If you're using a
virtual machine environment, the stack user in the default instack vm is already configured with passwordless sudo.
-1. Enable the openstack-m repository
+1. Enable the RDO icehouse and openstack-m repository
sudo yum -y install http://repos.fedorapeople.org/repos/openstack-m/openstack-m/openstack-m-release-icehouse-2.noarch.rpm
+ sudo yum install -y http://rdo.fedorapeople.org/openstack-icehouse/rdo-release-icehouse.rpm
1. Enable the fedora-openstack-m-testing yum repository.
diff --git a/README-source.md b/README-source.md
index 8f36b465c..f94b01504 100644
--- a/README-source.md
+++ b/README-source.md
@@ -4,6 +4,7 @@ instack-undercloud via source
1. Enable the openstack-m repository
sudo yum -y install http://repos.fedorapeople.org/repos/openstack-m/openstack-m/openstack-m-release-icehouse-2.noarch.rpm
+ sudo yum install -y http://rdo.fedorapeople.org/openstack-icehouse/rdo-release-icehouse.rpm
1. Enable the fedora-openstack-m-testing yum repository.
diff --git a/elements/undercloud-install/pre-install.d/00-icehouse-repo b/elements/undercloud-install/pre-install.d/00-icehouse-repo
deleted file mode 100755
index 8a59ccc98..000000000
--- a/elements/undercloud-install/pre-install.d/00-icehouse-repo
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-install-packages http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-1.noarch.rpm