@@ -1,5 +1,5 @@

-+++ a/ceph_deploy/hosts/__init__.py	2017-01-05 02:34:50.662524086 +0000

+--- a/ceph_deploy/hosts/__init__.py	2017-01-03 21:38:42.000000000 +0000

 @@ -7,7 +7,7 @@ on the type of distribution/version we a

  import logging

  from ceph_deploy import exc

@@ -11,14 +11,14 @@

  logger = logging.getLogger()

 @@ -68,7 +68,7 @@ def get(hostname,

      module.distro = module.normalized_name

-     module.is_el = module.normalized_name in ['redhat', 'centos', 'fedora', 'scientific']

+     module.is_el = module.normalized_name in ['redhat', 'centos', 'fedora', 'scientific', 'oracle']

      module.is_rpm = module.normalized_name in ['redhat', 'centos',

--                                               'fedora', 'scientific', 'suse']

-+                                               'fedora', 'scientific', 'suse', 'photon']

+-                                               'fedora', 'scientific', 'suse', 'oracle']

++                                               'fedora', 'scientific', 'suse', 'oracle', 'photon']

      module.is_deb = not module.is_rpm

      module.release = release

      module.codename = codename

-@@ -96,6 +96,7 @@ def _get_distro(distro, fallback=None, u

+@@ -97,6 +97,7 @@ def _get_distro(distro, fallback=None, u

          'redhat': centos,

          'fedora': fedora,

          'suse': suse,

@@ -26,8 +26,8 @@

          }

      if distro == 'redhat' and use_rhceph:

-@@ -112,6 +113,8 @@ def _normalized_distro_name(distro):

-         return 'scientific'

+@@ -115,6 +116,8 @@ def _normalized_distro_name(distro):

+         return 'oracle'

      elif distro.startswith(('suse', 'opensuse')):

          return 'suse'

 +    elif distro.startswith('photon'):

@@ -1,5 +1,5 @@

-+++ a/ceph_deploy/util/pkg_managers.py	2017-01-09 22:27:22.761855601 +0000

+--- a/ceph_deploy/util/pkg_managers.py	2017-01-03 21:38:42.000000000 +0000

 @@ -181,6 +181,13 @@ class Yum(RPMManagerBase):

      executable = 'yum'

      name = 'yum'

@@ -1,5 +1,5 @@

-+++ a/ceph_deploy/hosts/photon/__init__.py	2017-01-19 23:59:05.899266483 +0000

+--- a/ceph_deploy/hosts/photon/__init__.py	2017-03-30 23:17:33.833686463 +0000

 @@ -0,0 +1,23 @@

 +from . import mon  # noqa

 +from ceph_deploy.hosts.centos.install import repo_install  # noqa

@@ -1,5 +1,5 @@

-+++ a/ceph_deploy/hosts/photon/install.py	2017-01-10 23:45:59.844911936 +0000

+--- a/ceph_deploy/hosts/photon/install.py	2017-03-30 23:17:51.357073655 +0000

 @@ -0,0 +1,88 @@

 +from ceph_deploy.lib import remoto

 +from ceph_deploy.hosts.centos.install import repo_install, mirror_install  # noqa

deleted file mode 100644

@@ -1,59 +0,0 @@

-+++ a/ceph_deploy/hosts/photon/mon/create.py	2017-01-05 02:34:23.589511890 +0000

-@@ -0,0 +1,56 @@

-+from ceph_deploy.hosts import common

-+from ceph_deploy.util import system

-+from ceph_deploy.lib import remoto

-+

-+

-+def create(distro, args, monitor_keyring):

-+    hostname = distro.conn.remote_module.shortname()

-+    common.mon_create(distro, args, monitor_keyring, hostname)

-+

-+    if distro.init == 'sysvinit':

-+        service = distro.conn.remote_module.which_service()

-+        remoto.process.run(

-+            distro.conn,

-+            [

-+                service,

-+                'ceph',

-+                '-c',

-+                '/etc/ceph/{cluster}.conf'.format(cluster=args.cluster),

-+                'start',

-+                'mon.{hostname}'.format(hostname=hostname)

-+            ],

-+            timeout=7,

-+        )

-+

-+        system.enable_service(distro.conn)

-+    elif distro.init == 'systemd':

-+       # enable ceph target for this host (in case it isn't already enabled)

-+        remoto.process.run(

-+            distro.conn,

-+            [

-+                'systemctl',

-+                'enable',

-+                'ceph.target'

-+            ],

-+            timeout=7,

-+        )

-+

-+        # enable and start this mon instance

-+        remoto.process.run(

-+            distro.conn,

-+            [

-+                'systemctl',

-+                'enable',

-+                'ceph-mon@{hostname}'.format(hostname=hostname),

-+            ],

-+            timeout=7,

-+        )

-+        remoto.process.run(

-+            distro.conn,

-+            [

-+                'systemctl',

-+                'start',

-+                'ceph-mon@{hostname}'.format(hostname=hostname),

-+            ],

-+            timeout=7,

-+        )

@@ -1,5 +1,5 @@

-+++ a/ceph_deploy/hosts/photon/mon/__init__.py	2017-01-05 02:34:23.589511890 +0000

+--- a/ceph_deploy/hosts/photon/mon/__init__.py	2017-03-30 23:18:07.888497582 +0000

 @@ -0,0 +1,2 @@

 +from ceph_deploy.hosts.common import mon_add as add  # noqa

-+from .create import create  # noqa

++from ceph_deploy.hosts.common import mon_create as create  # noqa

@@ -1,5 +1,5 @@

-+++ a/ceph_deploy/hosts/photon/uninstall.py	2017-01-05 02:34:23.589511890 +0000

+--- a/ceph_deploy/hosts/photon/uninstall.py	2017-03-30 23:17:51.357073655 +0000

 @@ -0,0 +1,8 @@

 +def uninstall(distro, purge=False):

 +    packages = [

@@ -1,15 +1,15 @@

-+++ a/ceph_deploy/hosts/remotes.py	2017-01-23 23:43:38.822797323 +0000

+--- a/ceph_deploy/hosts/remotes.py	2017-01-03 21:38:42.000000000 +0000

 @@ -14,6 +14,12 @@ def platform_information(_linux_distribu

      """ detect platform information from remote host """

      linux_distribution = _linux_distribution or platform.linux_distribution

      distro, release, codename = linux_distribution()

-+

 +    if 'photon' in distro.lower():

 +        distro = 'photon'

 +        release = '1.0'

 +        codename = 'photon'

 +

++

      if not codename and 'debian' in distro.lower():  # this could be an empty string in Debian

          debian_codenames = {

              '8': 'jessie',

@@ -1,6 +1,6 @@

 Name:           ceph-deploy

-Version:        1.5.36

-Release:        2%{?dist}

+Version:        1.5.37

+Release:        1%{?dist}

 Url:            http://ceph.com/

 Summary:        Admin and deploy tool for Ceph

 License:        MIT

@@ -8,7 +8,7 @@ Group:          System/Filesystems

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://pypi.python.org/packages/23/f0/f144b1b55534a3e10d269dbfbe092e0aaa1c4b826c24f5df9320ae9bdfce/%{name}-%{version}.tar.gz

-%define sha1 ceph-deploy=32ae7da1f89c40d26e342b558723bac60dd59432

+%define sha1 ceph-deploy=5c19b318320f2729c5b15da7159aa9824b885c1a

 Patch0:		ceph-deploy-init.patch

 Patch1:		ceph-deploy-package-manager.patch

 Patch2:		ceph-deploy-remote.patch

@@ -16,7 +16,6 @@ Patch3:		ceph-deploy-photon-distro-init.patch

 Patch4:		ceph-deploy-photon-distro-install.patch

 Patch5:		ceph-deploy-photon-distro-uninstall.patch

 Patch6:		ceph-deploy-photon-distro-mon-init.patch

-Patch7:		ceph-deploy-photon-distro-mon-create.patch

 BuildRequires:  python2

 BuildRequires:  python2-devel

@@ -38,7 +37,6 @@ An easy to use admin tool for deploy ceph storage clusters.

 %patch4 -p1

 %patch5 -p1

 %patch6 -p1

-%patch7 -p1

 %build

 python setup.py build

@@ -57,6 +55,8 @@ install -m 0755 -D scripts/ceph-deploy $RPM_BUILD_ROOT/usr/bin

 %{_bindir}/ceph-deploy

 %changelog

+*   Thu Mar 30 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5.37-1

+-   Upgrading to version 1.5.37

 *   Thu Mar 9 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5.36-2

 -   Adding python-setuptools to Requires section

 *   Mon Jan 23 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5.36-1