Repository: incubator-metron Updated Branches: refs/heads/master 4c114a51f -> 339f95ed3
METRON-826 Ambari MPack should utilize service specific repos closes apache/incubator-metron#515 Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/339f95ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/339f95ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/339f95ed Branch: refs/heads/master Commit: 339f95ed3b940071f55545a3a912cbd94de0911f Parents: 4c114a5 Author: dlyle65535 <dlyle65...@gmail.com> Authored: Mon Apr 10 08:02:23 2017 -0400 Committer: David Lyle <dlyle65...@gmail.com> Committed: Mon Apr 10 08:02:23 2017 -0400 ---------------------------------------------------------------------- .../ELASTICSEARCH/2.3.3/repos/repoinfo.xml | 32 +++++++++ .../addon-services/KIBANA/4.5.1/metainfo.xml | 4 -- .../KIBANA/4.5.1/repos/repoinfo.xml | 41 ++++++++++++ .../METRON/CURRENT/repos/repoinfo.xml | 32 +++++++++ .../2.3.3/package/scripts/elastic_master.py | 12 +--- .../2.3.3/package/scripts/elastic_slave.py | 10 +-- .../4.5.1/package/scripts/kibana_master.py | 27 -------- .../METRON/CURRENT/configuration/metron-env.xml | 26 -------- .../package/scripts/enrichment_commands.py | 31 --------- .../package/scripts/enrichment_master.py | 2 - .../package/scripts/indexing_commands.py | 25 ------- .../CURRENT/package/scripts/indexing_master.py | 2 - .../CURRENT/package/scripts/metron_service.py | 1 - .../package/scripts/params/params_linux.py | 7 -- .../CURRENT/package/scripts/parser_commands.py | 25 ------- .../CURRENT/package/scripts/parser_master.py | 2 - .../METRON/CURRENT/themes/metron_theme.json | 68 -------------------- .../roles/metron-rpms/tasks/main.yml | 11 ++++ 18 files changed, 120 insertions(+), 238 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/2.3.3/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/2.3.3/repos/repoinfo.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/2.3.3/repos/repoinfo.xml new file mode 100644 index 0000000..0a9caac --- /dev/null +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/2.3.3/repos/repoinfo.xml @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<reposinfo> + <os family="redhat6"> + <repo> + <baseurl>https://packages.elastic.co/elasticsearch/2.x/centos</baseurl> + <repoid>elastic-2.x</repoid> + <reponame>ELASTICSEARCH</reponame> + </repo> + </os> + <os family="redhat7"> + <repo> + <baseurl>https://packages.elastic.co/elasticsearch/2.x/centos</baseurl> + <repoid>elasticsearch-2.x</repoid> + <reponame>ELASTICSEARCH</reponame> + </repo> + </os> +</reposinfo> + http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/4.5.1/metainfo.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/4.5.1/metainfo.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/4.5.1/metainfo.xml index 156a34a..494f71b 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/4.5.1/metainfo.xml +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/4.5.1/metainfo.xml @@ -21,10 +21,6 @@ <schemaVersion>2.0</schemaVersion> <services> <service> - <name>ELASTICSEARCH</name> - <extends>common-services/ELASTICSEARCH/2.3.3</extends> - </service> - <service> <name>KIBANA</name> <extends>common-services/KIBANA/4.5.1</extends> </service> http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/4.5.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/4.5.1/repos/repoinfo.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/4.5.1/repos/repoinfo.xml new file mode 100644 index 0000000..b05c2cf --- /dev/null +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/4.5.1/repos/repoinfo.xml @@ -0,0 +1,41 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<reposinfo> + <os family="redhat6"> + <repo> + <baseurl>http://packages.elastic.co/kibana/4.5/centos</baseurl> + <repoid>kibana-4.x</repoid> + <reponame>KIBANA</reponame> + </repo> + <repo> + <baseurl>http://packages.elastic.co/curator/4/centos/6</baseurl> + <repoid>ES-Curator-4.x</repoid> + <reponame>CURATOR</reponame> + </repo> + </os> + <os family="redhat7"> + <repo> + <baseurl>http://packages.elastic.co/kibana/4.5/centos</baseurl> + <repoid>kibana-4.x</repoid> + <reponame>KIBANA</reponame> + </repo> + <repo> + <baseurl>http://packages.elastic.co/curator/4/centos/7</baseurl> + <repoid>ES-Curator-4.x</repoid> + <reponame>CURATOR</reponame> + </repo> + </os> +</reposinfo> http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/METRON/CURRENT/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/METRON/CURRENT/repos/repoinfo.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/METRON/CURRENT/repos/repoinfo.xml new file mode 100644 index 0000000..fac4f77 --- /dev/null +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/METRON/CURRENT/repos/repoinfo.xml @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<reposinfo> + <os family="redhat6"> + <repo> + <baseurl>file:///localrepo</baseurl> + <repoid>METRON-${metron.version}</repoid> + <reponame>METRON</reponame> + </repo> + </os> + <os family="redhat7"> + <repo> + <baseurl>file:///localrepo</baseurl> + <repoid>METRON-${metron.version}</repoid> + <reponame>METRON</reponame> + </repo> + </os> +</reposinfo> + http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_master.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_master.py index 3ad4e1f..706610e 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_master.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_master.py @@ -19,6 +19,7 @@ limitations under the License. from resource_management.core.resources.system import Execute from resource_management.libraries.script import Script +from resource_management.core.logger import Logger from elastic import elastic @@ -27,16 +28,7 @@ class Elasticsearch(Script): def install(self, env): import params env.set_params(params) - - print 'Install the Master' - Execute('rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch') - Execute("echo \"[elasticsearch-2.x]\n" - "name=Elasticsearch repository for 2.x packages\n" - "baseurl=https://packages.elastic.co/elasticsearch/2.x/centos\n"; - "gpgcheck=1\n" - "gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch\n"; - "enabled=1\" > /etc/yum.repos.d/elasticsearch.repo") - + Logger.info('Install ES Master Node') self.install_packages(env) def configure(self, env, upgrade_type=None, config_dir=None): http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_slave.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_slave.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_slave.py index 4b636e8..7f7f21a 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_slave.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/elastic_slave.py @@ -19,6 +19,7 @@ limitations under the License. from resource_management.core.resources.system import Execute from resource_management.libraries.script import Script +from resource_management.core.logger import Logger from slave import slave @@ -27,14 +28,7 @@ class Elasticsearch(Script): def install(self, env): import params env.set_params(params) - print 'Install the Slave' - Execute('rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch') - Execute("echo \"[elasticsearch-2.x]\n" - "name=Elasticsearch repository for 2.x packages\n" - "baseurl=https://packages.elastic.co/elasticsearch/2.x/centos\n"; - "gpgcheck=1\n" - "gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch\n"; - "enabled=1\" > /etc/yum.repos.d/elasticsearch.repo") + Logger.info('Install ES Data Node') self.install_packages(env) def configure(self, env, upgrade_type=None, config_dir=None): http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py index 028ea9e..faca7a8 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py @@ -37,34 +37,7 @@ class Kibana(Script): def install(self, env): import params env.set_params(params) - Logger.info("Install Kibana Master") - - # TODO: Figure this out for all supported OSes - Execute('rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch') - Logger.info("Installing Kibana CentOS/RHEL repo") - Execute("echo \"[kibana-4.x]\n" - "name=Kibana repository for 4.5.x packages\n" - "baseurl=http://packages.elastic.co/kibana/4.5/centos\n"; - "gpgcheck=1\n" - "gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch\n"; - "enabled=1\" > /etc/yum.repos.d/kibana.repo") - - majorVersion = OSCheck.get_os_major_version() - Logger.info("CentOS/RHEL major version reported by Ambari: " + majorVersion) - if majorVersion == "6" or majorVersion == "7": - repoName = "name=CentOS/RHEL {0} repository for Elasticsearch Curator 4.x packages\n".format(majorVersion) - baseUrl = "baseurl=http://packages.elastic.co/curator/4/centos/{0}\n".format(majorVersion) - Logger.info("Installing Elasticsearch Curator CentOS/RHEL {0} repo".format(majorVersion)) - Execute("echo \"[curator-4]\n" + - repoName + - baseUrl + - "gpgcheck=1\n" - "gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch\n"; - "enabled=1\" > /etc/yum.repos.d/curator.repo") - else: - raise Exception("Unsupported CentOS/RHEL version: " + majorVersion) - self.install_packages(env) def configure(self, env, upgrade_type=None, config_dir=None): http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml index 5598a96..90e0757 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml @@ -125,32 +125,6 @@ <value></value> </property> <property> - <name>repo_type</name> - <display-name>Repository Type</display-name> - <description>Type of Repository: Local or Remote</description> - <value>local</value> - <value-attributes> - <overridable>false</overridable> - <type>value-list</type> - <entries> - <entry> - <value>local</value> - <label>Local</label> - </entry> - <entry> - <value>remote</value> - <label>Remote</label> - </entry> - </entries> - <selection-cardinality>1</selection-cardinality> - </value-attributes> - </property> - <property> - <name>repo_url</name> - <display-name>Repository URL</display-name> - <value></value> - </property> - <property> <name>global-json</name> <display-name>global.json template</display-name> <description>This is the jinja template for global.json file</description> http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py index a17145d..3d7eb66 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py @@ -74,37 +74,6 @@ class EnrichmentCommands: owner=self.__params.metron_user, mode=0775) - def setup_repo(self): - - def local_repo(): - Logger.info("Setting up local repo") - Execute("yum -y install createrepo") - Execute("createrepo /localrepo") - Execute("chmod -R o-w+r /localrepo") - - def remote_repo(): - Logger.info('Using remote repo') - - yum_repo_types = { - 'local': local_repo, - 'remote': remote_repo - } - - repo_type = self.__params.yum_repo_type - - if repo_type in yum_repo_types: - yum_repo_types[repo_type]() - Logger.info("Writing out repo file") - repo_template = ("echo \"[METRON-${metron.version}]\n" - "name=Metron ${metron.version} packages\n" - "baseurl={0}\n" - "gpgcheck=0\n" - "enabled=1\n\"" - " > /etc/yum.repos.d/metron.repo") - Execute(repo_template.format(self.__params.repo_url)) - else: - raise ValueError("Unsupported repo type '{0}'".format(repo_type)) - def init_geo(self): Logger.info("Creating HDFS location for GeoIP database") self.__params.HdfsResource(self.__params.geoip_hdfs_dir, http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_master.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_master.py index 362b2e2..1e734b4 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_master.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_master.py @@ -29,8 +29,6 @@ class Enrichment(Script): def install(self, env): from params import params env.set_params(params) - commands = EnrichmentCommands(params) - commands.setup_repo() self.install_packages(env) self.configure(env) http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py index a24a510..819085f 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py @@ -46,31 +46,6 @@ class IndexingCommands: owner=self.__params.metron_user, mode=0775) - def setup_repo(self): - def local_repo(): - Logger.info("Setting up local repo") - Execute("yum -y install createrepo") - Execute("createrepo /localrepo") - Execute("chmod -R o-w+r /localrepo") - Execute("echo \"[METRON-${metron.version}]\n" - "name=Metron ${metron.version} packages\n" - "baseurl=file:///localrepo\n" - "gpgcheck=0\n" - "enabled=1\" > /etc/yum.repos.d/local.repo") - - def remote_repo(): - print('Using remote repo') - - yum_repo_types = { - 'local': local_repo, - 'remote': remote_repo - } - repo_type = self.__params.yum_repo_type - if repo_type in yum_repo_types: - yum_repo_types[repo_type]() - else: - raise ValueError("Unsupported repo type '{0}'".format(repo_type)) - def init_kafka_topics(self): Logger.info('Creating Kafka topics') command_template = """{0}/kafka-topics.sh \ http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py index 53fb17b..8189e3f 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py @@ -33,8 +33,6 @@ class Indexing(Script): def install(self, env): from params import params env.set_params(params) - commands = IndexingCommands(params) - commands.setup_repo() self.install_packages(env) def configure(self, env, upgrade_type=None, config_dir=None): http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py index 57da2c7..8415460 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py @@ -23,7 +23,6 @@ from resource_management.core.resources.system import Execute from resource_management.core.source import InlineTemplate from resource_management.libraries.functions import format as ambari_format - def init_config(): Logger.info('Loading config into ZooKeeper') Execute(ambari_format( http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py index a5e1e9d..a4bfcbd 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py @@ -66,13 +66,6 @@ es_url = ",".join([host + ":" + es_binary_port for host in es_host_list]) es_http_port = config['configurations']['metron-env']['es_http_port'] es_http_url = es_host_list[0] + ":" + es_http_port -# install repo -yum_repo_type = config['configurations']['metron-env']['repo_type'] -if yum_repo_type == 'local': - repo_url = 'file:///localrepo' -else: - repo_url = config['configurations']['metron-env']['repo_url'] - # hadoop params stack_root = Script.get_stack_root() # This is the cluster group named 'hadoop'. Its membership is the stack process user ids not individual users. http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_commands.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_commands.py index 574d7e8..bd3ad2c 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_commands.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_commands.py @@ -71,31 +71,6 @@ class ParserCommands: def get_parser_list(self): return self.__parser_list - def setup_repo(self): - def local_repo(): - Logger.info("Setting up local repo") - Execute("yum -y install createrepo") - Execute("createrepo /localrepo") - Execute("chmod -R o-w+r /localrepo") - Execute("echo \"[METRON-${metron.version}]\n" - "name=Metron ${metron.version} packages\n" - "baseurl=file:///localrepo\n" - "gpgcheck=0\n" - "enabled=1\" > /etc/yum.repos.d/local.repo") - - def remote_repo(): - print('Using remote repo') - - yum_repo_types = { - 'local': local_repo, - 'remote': remote_repo - } - repo_type = self.__params.yum_repo_type - if repo_type in yum_repo_types: - yum_repo_types[repo_type]() - else: - raise ValueError("Unsupported repo type '{0}'".format(repo_type)) - def init_kafka_topics(self): Logger.info('Creating Kafka topics') command_template = """{0}/kafka-topics.sh \ http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_master.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_master.py index e6d2ac6..2721d13 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_master.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_master.py @@ -34,8 +34,6 @@ class ParserMaster(Script): def install(self, env): from params import params env.set_params(params) - commands = ParserCommands(params) - commands.setup_repo() self.install_packages(env) def configure(self, env, upgrade_type=None, config_dir=None): http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json index 1f56070..9d0f56c 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json @@ -31,37 +31,7 @@ } ] } - }, - { - "name": "metron_repo", - "display-name" : "Repository", - "layout": { - "tab-columns" : "1", - "tab-rows" : "1", - "sections" : [ - { - "name" : "section-repo", - "row-index": "0", - "column-index" : "0", - "row-span": "1", - "column-span": "1", - "section-columns": "1", - "section-rows": "1", - "subsections": [ - { - "name": "subsection-repo", - "row-index": "0", - "column-index": "0", - "row-span": "1", - "column-span": "1" - } - ] - } - ] - } } - ] - } ], "placement": { "configuration-layout": "default", @@ -85,32 +55,6 @@ { "config": "metron-env/es_cluster_name", "subsection-name": "subsection-general-indexing" - }, - { - "config": "metron-env/repo_type", - "subsection-name": "subsection-repo" - }, - { - "config": "metron-env/repo_url", - "subsection-name": "subsection-repo", - "depends-on": [ - { - "configs":[ - "metron-env/repo_type" - ], - "if": "${metron-env/repo_type} === remote", - "then": { - "property_value_attributes": { - "visible": true - } - }, - "else": { - "property_value_attributes": { - "visible": false - } - } - } - ] } ] }, @@ -138,18 +82,6 @@ "widget": { "type": "text-field" } - }, - { - "config": "metron-env/repo_type", - "widget": { - "type": "toggle" - } - }, - { - "config": "metron-env/repo_url", - "widget": { - "type": "text-field" - } } ] } http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/339f95ed/metron-deployment/roles/metron-rpms/tasks/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/roles/metron-rpms/tasks/main.yml b/metron-deployment/roles/metron-rpms/tasks/main.yml index 7c7a2d7..8ea3088 100644 --- a/metron-deployment/roles/metron-rpms/tasks/main.yml +++ b/metron-deployment/roles/metron-rpms/tasks/main.yml @@ -35,3 +35,14 @@ mode: 0755 with_fileglob: - "{{ metron_rpm_glob }}" + +- name: Install createrepo + package: + name: createrepo + state: installed + +- name: Create local repo with new packages + shell: "createrepo /localrepo" + args: + creates: /localrepo/repodata +
