You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/06/23 16:56:50 UTC
git commit: AMBARI-6237. Add HDP-UTILS repos field for ubuntu.
(aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 2c6c0492f -> 7d9d45253
AMBARI-6237. Add HDP-UTILS repos field for ubuntu. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d9d4525
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d9d4525
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d9d4525
Branch: refs/heads/trunk
Commit: 7d9d452533e8dc23575da11d1082b2e037e1a100
Parents: 2c6c049
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Jun 23 17:56:44 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Jun 23 17:56:44 2014 +0300
----------------------------------------------------------------------
.../hooks/before-INSTALL/scripts/repo_initialization.py | 9 ++++++---
.../src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml | 5 +++++
ambari-web/app/config.js | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9d4525/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/repo_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/repo_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/repo_initialization.py
index d3bdc70..9f76a58 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/repo_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/repo_initialization.py
@@ -19,7 +19,8 @@ limitations under the License.
from resource_management import *
import json
-_UBUNTU_REPO_COMPONENTS = ["HDP", "main"]
+# components_lits = repoName + postfix
+_UBUNTU_REPO_COMPONENTS_POSTFIX = ["main"]
def _alter_repo(action, repo_string, repo_template):
"""
@@ -36,14 +37,16 @@ def _alter_repo(action, repo_string, repo_template):
repo['baseUrl'] = None
if not 'mirrorsList' in repo:
repo['mirrorsList'] = None
-
+
+ ubuntu_components = [ repo['repoName'] ] + _UBUNTU_REPO_COMPONENTS_POSTFIX
+
Repository(repo['repoId'],
action = action,
base_url = repo['baseUrl'],
mirror_list = repo['mirrorsList'],
repo_file_name = repo['repoName'],
repo_template = repo_template,
- components = _UBUNTU_REPO_COMPONENTS, # ubuntu specific
+ components = ubuntu_components, # ubuntu specific
)
def install_repos():
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9d4525/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml
index b75d512..7ea93c2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml
@@ -59,5 +59,10 @@
<repoid>HDP-2.1</repoid>
<reponame>HDP</reponame>
</repo>
+ <repo>
+ <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.17/repos/ubuntu12</baseurl>
+ <repoid>HDP-UTILS-1.1.0.17</repoid>
+ <reponame>HDP-UTILS</reponame>
+ </repo>
</os>
</reposinfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9d4525/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 8590bd5..03079d4 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -75,7 +75,7 @@ App.supports = {
autoRollbackHA: false,
appTimelineServer: true,
jobs: true,
- ubuntu: false,
+ ubuntu: true,
views: false,
flume: false,
databaseConnection: true