{
  "name": "ondemand_server",
  "default_attributes": {
  },
  "json_class": "Chef::Role",
  "env_run_lists": {
  },
  "run_list": [
    "recipe[ondemand_base::ubuntu]",
    "recipe[ondemand_base::centos]"
  ],
  "description": "",
  "chef_type": "role",
  "override_attributes": {
    "webtrends": {
      "logdir": "d:\\logs",
      "common_msi": "WebTrendsCommonLib.msi",
	  "pod": "dev",
      "installdir": "d:\\wrs"
    },
    "ntp": {
      "servers": [
        "time.webtrends.corp"
      ]
    },
    "authorization": {
      "sudo": {
        "groups": [
          "domain-admins",
          "DEVOPS\\\\domain-admins"
        ],
        "users": [
          "bobo"
        ],
        "passwordless": false
      },
      "ad_likewise": {
       "auth_domain_user": "Admin",
       "auth_domain_password": "Bijoux01",
       "primary_domain": "DEVOPS.DMZ"
      }
    }
  }
}

{
  "name": "ondemand_server",
  "default_attributes": {
  },
  "json_class": "Chef::Role",
  "env_run_lists": {
  },
  "run_list": [
    "recipe[ondemand_base::ubuntu]",
    "recipe[ondemand_base::centos]"
  ],
  "description": "",
  "chef_type": "role",
  "override_attributes": {
    "webtrends": {
      "logdir": "d:\\logs",
      "common_msi": "WebTrendsCommonLib.msi",
	  "pod": "dev",
      "installdir": "d:\\wrs"
    },
      "java": {
       "install_flavor": "oracle",
       "jdk_version": "6"
      }
    }
  }
}

Remove authorization items and add Java items to the on demand role
Remove authorization items and add Java items to the on demand role


Former-commit-id: 1f18a0c9c4ad948161a3adf3cf0fb47896f58846