Description of problem:
I install ose-1.2 using RHN Classic, and subscription-manager rpm is already installed on the system. Now trying to upgrade it to ose-2.0.
# ose-upgrade begin
INFO: OpenShift node installed.
INFO: Setting host step 'begin' status to UPGRADING
INFO: Starting upgrade number 2 to version 2.0.
INFO: loading list of installed packages
ERROR: detect_package_source
Both RHN and RHSM are enabled on this host.  Please disable one or the other
and re-run this tool.
INFO: Setting host step 'begin' status to FAILED

In /usr/lib/ruby/site_ruby/1.8/ose-upgrade/main.rb:
    def detect_package_source
      return @package_source if @package_source
      load_rpm_list
      have_rhn = File.exists? '/etc/sysconfig/rhn/systemid'
      have_rhsm = @rpms['subscription-manager'] && system('subscription-manager identity >& /dev/null')
      if have_rhn && have_rhsm
        do_fail "Both RHN and RHSM are enabled on this host.  Please disable one or the other\n" +
                "and re-run this tool."
        @package_source = nil
      elsif have_rhn
        @package_source = :rhn
        verbose "RHN subscription detected."
      elsif have_rhsm
        @package_source = :rhsm
        verbose "Subscription-manager subscription detected."
      else
        @package_source = :repo
        verbose "No subscription detected; assuming plain yum repos."
      end
      return @package_source
    end

When system has installed subscription-manager, and "subscription-manager identity" return success, then it is treated as RHSM is enabled, this logic is not correct.

[root@node1 openshift]# rpm -q subscription-manager
subscription-manager-1.9.11-1.el6.x86_64
[root@node1 openshift]# subscription-manager identity
server type: RHN Classic


Workaround: 
Remove subscription-manager package from system.

Version-Release number of selected component (if applicable):
openshift-enterprise-release-2.0.0c-1.git.19.ecc76e1.el6op.noarch

How reproducible:
Always

Steps to Reproduce:
1.
2.
3.

Actual results:


Expected results:


Additional info: