AMBARI-15775 Integrate Red Hat Satellite option in Ambari Admin (zhewang)

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js

@@ -221,6 +221,7 @@ angular.module('ambariAdminConsole')
     var updateRepoUrl = false;
     angular.forEach($scope.osList, function (os) {
       var savedUrls = $scope.defaulfOSRepos[os.OperatingSystems.os_type];
+      os.OperatingSystems.ambari_managed_repositories = !$scope.useRedhatSatellite;
       if (os.selected) {
         var currentRepos = os.repositories;
         if (!savedUrls || currentRepos[0].Repositories.base_url != savedUrls.defaultBaseUrl

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js

@@ -42,6 +42,7 @@ angular.module('ambariAdminConsole')
       $scope.displayName = response.displayName || $t('common.NA');
       $scope.version = response.version || $t('common.NA');
       $scope.actualVersion = response.actualVersion || $t('common.NA');
+      $scope.useRedhatSatellite = !response.ambari_managed_repositories;
       $scope.updateObj = response.updateObj;
       $scope.upgradeStack = {
         stack_name: response.stackName,
@@ -134,6 +135,7 @@ angular.module('ambariAdminConsole')
     var updateRepoUrl = false;
     angular.forEach($scope.osList, function (os) {
       var savedUrls = $scope.defaulfOSRepos[os.OperatingSystems.os_type];
+      os.OperatingSystems.ambari_managed_repositories = !$scope.useRedhatSatellite;
       if (os.selected) {
         var currentRepos = os.repositories;
         if (!savedUrls || currentRepos[0].Repositories.base_url != savedUrls.defaultBaseUrl

ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js

@@ -150,6 +150,7 @@ angular.module('ambariAdminConsole')
         // get repo by stack version(2.3) and id (112)
         var url = Settings.baseUrl + '/stacks/' + stack_name + '/versions?' +
           'fields=repository_versions/operating_systems/repositories/*' +
+          ',repository_versions/operating_systems/OperatingSystems/*' +
           ',repository_versions/RepositoryVersions/*' +
           '&repository_versions/RepositoryVersions/id=' + repoVersion +
           '&Versions/stack_version=' + stack_version;
@@ -157,6 +158,7 @@ angular.module('ambariAdminConsole')
         // get repo by repoVersion (2.3.6.0-2345)
         var url = Settings.baseUrl + '/stacks/' + stack_name + '/versions?' +
           'fields=repository_versions/operating_systems/repositories/*' +
+          ',repository_versions/operating_systems/OperatingSystems/*' +
           ',repository_versions/RepositoryVersions/*' +
           '&repository_versions/RepositoryVersions/repository_version=' + repoVersion;
       }
@@ -176,6 +178,7 @@ angular.module('ambariAdminConsole')
           displayName: data.repository_versions[0].RepositoryVersions.release ? data.Versions.stack_name + '-' + data.repository_versions[0].RepositoryVersions.release.version :
             data.Versions.stack_name + '-' + data.repository_versions[0].RepositoryVersions.repository_version.split('-')[0], //HDP-2.3.4.0
           repoVersionFullName : data.Versions.stack_name + '-' + data.repository_versions[0].RepositoryVersions.repository_version,
+          ambari_managed_repositories: data.repository_versions[0].operating_systems[0].OperatingSystems.ambari_managed_repositories !== false,
           osList: data.repository_versions[0].operating_systems,
           updateObj: data.repository_versions[0]
         };

ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html

@@ -179,7 +179,7 @@
             </label>
           </div>
         </div>
-        <div class="col-sm-12 hidden" id="use-redhat">
+        <div class="col-sm-12" id="use-redhat">
           <div class="checkbox">
             <label>
               <input type="checkbox" ng-model="useRedhatSatellite" ng-change="clearErrors()">