AMBARI-18613: Minor fixes for HDF mpack (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d132ca17 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d132ca17 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d132ca17 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: d132ca17354b867cb167f8800e868a27f0b6252d Parents: 73f1dea Author: Jayush Luniya <jlun...@hortonworks.com> Authored: Mon Oct 17 13:06:51 2016 -0700 Committer: Jayush Luniya <jlun...@hortonworks.com> Committed: Mon Oct 17 13:06:51 2016 -0700 ---------------------------------------------------------------------- .../NIFI/1.0.0/package/scripts/params.py | 2 +- .../resources/stacks/HDF/2.0/repos/repoinfo.xml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d132ca17/contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/package/scripts/params.py b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/package/scripts/params.py index 087cef4..def8f45 100644 --- a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/package/scripts/params.py +++ b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/common-services/NIFI/1.0.0/package/scripts/params.py @@ -350,7 +350,7 @@ if has_ranger_admin: nifi_authentication = config['configurations']['ranger-nifi-plugin-properties']['nifi.authentication'] ranger_id_owner_for_certificate = config['configurations']['ranger-nifi-plugin-properties']['owner.for.certificate'] nifi_id_owner_for_certificate = config['configurations']['ranger-nifi-policymgr-ssl']['owner.for.certificate'] - regex = r"(CN)=([a-zA-Z0-9\.\-\* ]*)" + regex = r"(CN)=([a-zA-Z0-9\.\-\*\[\]\|\:]*)" match = re.search(regex, nifi_id_owner_for_certificate) common_name_for_certificate = match.group(2) if match else 'NONE' http://git-wip-us.apache.org/repos/asf/ambari/blob/d132ca17/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/repos/repoinfo.xml b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/repos/repoinfo.xml index 3f8fd9e..27cf047 100644 --- a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/repos/repoinfo.xml +++ b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/repos/repoinfo.xml @@ -16,10 +16,10 @@ limitations under the License. --> <reposinfo> - <latest>http://s3.amazonaws.com/dev.hortonworks.com/HDF/hdf_urlinfo.json</latest> + <latest>http://public-repo-1.hortonworks.com/HDF/hdf_urlinfo.json</latest> <os family="redhat6"> <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDF/centos6/2.x/updates/2.0.0.0</baseurl> + <baseurl>http://public-repo-1.hortonworks.com/HDF/centos6/2.x/updates/2.0.0.0</baseurl> <repoid>HDF-2.0</repoid> <reponame>HDF</reponame> </repo> @@ -31,7 +31,7 @@ </os> <os family="redhat7"> <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDF/centos7/2.x/updates/2.0.0.0</baseurl> + <baseurl>http://public-repo-1.hortonworks.com/HDF/centos7/2.x/updates/2.0.0.0</baseurl> <repoid>HDF-2.0</repoid> <reponame>HDF</reponame> </repo> @@ -43,7 +43,7 @@ </os> <os family="suse11"> <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDF/suse11sp3/2.x/updates/2.0.0.0</baseurl> + <baseurl>http://public-repo-1.hortonworks.com/HDF/suse11sp3/2.x/updates/2.0.0.0</baseurl> <repoid>HDF-2.0</repoid> <reponame>HDF</reponame> </repo> @@ -55,7 +55,7 @@ </os> <os family="suse12"> <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDF/suse11sp3/2.x/updates/2.0.0.0</baseurl> + <baseurl>http://public-repo-1.hortonworks.com/HDF/suse11sp3/2.x/updates/2.0.0.0</baseurl> <repoid>HDF-2.0</repoid> <reponame>HDF</reponame> </repo> @@ -67,7 +67,7 @@ </os> <os family="ubuntu12"> <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDF/ubuntu12/2.x/updates/2.0.0.0</baseurl> + <baseurl>http://public-repo-1.hortonworks.com/HDF/ubuntu12/2.x/updates/2.0.0.0</baseurl> <repoid>HDF-2.0</repoid> <reponame>HDF</reponame> </repo> @@ -79,24 +79,24 @@ </os> <os family="debian7"> <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDF/debian7/2.x/updates/2.0.0.0</baseurl> + <baseurl>http://public-repo-1.hortonworks.com/HDF/debian7/2.x/updates/2.0.0.0</baseurl> <repoid>HDF-2.0</repoid> <reponame>HDF</reponame> </repo> <repo> - <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.21/repos/debian6</baseurl> + <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.21/repos/debian7</baseurl> <repoid>HDP-UTILS-1.1.0.21</repoid> <reponame>HDP-UTILS</reponame> </repo> </os> <os family="ubuntu14"> <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDF/ubuntu14/2.x/updates/2.0.0.0</baseurl> + <baseurl>http://public-repo-1.hortonworks.com/HDF/ubuntu14/2.x/updates/2.0.0.0</baseurl> <repoid>HDF-2.0</repoid> <reponame>HDF</reponame> </repo> <repo> - <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.21/repos/ubuntu12</baseurl> + <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.21/repos/ubuntu14</baseurl> <repoid>HDP-UTILS-1.1.0.21</repoid> <reponame>HDP-UTILS</reponame> </repo>
