Browse code

Merge "Use the rdo havana repo with the RHEL family"

Jenkins authored on 2013/10/09 06:37:18
Showing 1 changed files
... ...
@@ -150,8 +150,8 @@ fi
150 150
 
151 151
 if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
152 152
     # Installing Open vSwitch on RHEL6 requires enabling the RDO repo.
153
-    RHEL6_RDO_REPO_RPM=${RHEL6_RDO_REPO_RPM:-"http://rdo.fedorapeople.org/openstack/openstack-grizzly/rdo-release-grizzly-3.noarch.rpm"}
154
-    RHEL6_RDO_REPO_ID=${RHEL6_RDO_REPO_ID:-"openstack-grizzly"}
153
+    RHEL6_RDO_REPO_RPM=${RHEL6_RDO_REPO_RPM:-"http://rdo.fedorapeople.org/openstack-havana/rdo-release-havana.rpm"}
154
+    RHEL6_RDO_REPO_ID=${RHEL6_RDO_REPO_ID:-"openstack-havana"}
155 155
     if ! yum repolist enabled $RHEL6_RDO_REPO_ID | grep -q $RHEL6_RDO_REPO_ID; then
156 156
         echo "RDO repo not detected; installing"
157 157
         yum_install $RHEL6_RDO_REPO_RPM || \