Repository: bigtop Updated Branches: refs/heads/master 2cb431e68 -> be9a183b4
BIGTOP-2911: Set solr service ports to default 8983/8984 Solr uses 8983/8984 as its default service ports. This change also sync with descriptions in Hue's deploy file. Change-Id: Iab670c16eeabff9422de2c0a90ca824ac3f22c89 Signed-off-by: Jun He <[email protected]> Signed-off-by: Evans Ye <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/be9a183b Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/be9a183b Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/be9a183b Branch: refs/heads/master Commit: be9a183b4db8f183c14cc9a4ed853cf7bbbab2e5 Parents: 2cb431e Author: Jun He <[email protected]> Authored: Thu Oct 19 16:05:31 2017 +0800 Committer: Evans Ye <[email protected]> Committed: Thu Nov 30 10:22:55 2017 +0800 ---------------------------------------------------------------------- bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml | 2 +- bigtop-deploy/puppet/modules/solr/manifests/init.pp | 2 +- bigtop-deploy/puppet/modules/solr/tests/init.pp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/be9a183b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml index 6ff39cc..cc87ac1 100644 --- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml +++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml @@ -138,7 +138,7 @@ solr::server::root_url: "%{hiera('bigtop::hadoop_namenode_uri')}" solr::server::zk: "%{hiera('hadoop::zk')}" solr::server::kerberos_realm: "%{hiera('kerberos::site::realm')}" # Default but needed here to make sure, hue uses the same port -solr::server::port: "1978" +solr::server::port: "8983" hadoop_oozie::server::kerberos_realm: "%{hiera('kerberos::site::realm')}" http://git-wip-us.apache.org/repos/asf/bigtop/blob/be9a183b/bigtop-deploy/puppet/modules/solr/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/solr/manifests/init.pp b/bigtop-deploy/puppet/modules/solr/manifests/init.pp index 99a8f3b..62063ef 100644 --- a/bigtop-deploy/puppet/modules/solr/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/solr/manifests/init.pp @@ -21,7 +21,7 @@ class solr { } } - class server($port = "1978", $port_admin = "1979", $zk = "localhost:2181", $root_url = "hdfs://localhost:8020/solr", $kerberos_realm = "") { + class server($port = "8983", $port_admin = "8984", $zk = "localhost:2181", $root_url = "hdfs://localhost:8020/solr", $kerberos_realm = "") { package { "solr-server": ensure => latest, } http://git-wip-us.apache.org/repos/asf/bigtop/blob/be9a183b/bigtop-deploy/puppet/modules/solr/tests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/solr/tests/init.pp b/bigtop-deploy/puppet/modules/solr/tests/init.pp index cc3f73c..c330749 100644 --- a/bigtop-deploy/puppet/modules/solr/tests/init.pp +++ b/bigtop-deploy/puppet/modules/solr/tests/init.pp @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -solr::server { "test-solr-server": - port => "1978", - port_admin => "1979", +solr::server { "test-solr-server": + port => "8983", + port_admin => "8984", zk => "localhost:2181", root_url => "hdfs://localhost:8020/solr", kerberos_realm => "KRB.YOU.ORG",
