Repository: bigtop Updated Branches: refs/heads/master 940b6fda2 -> 4da87e1d3
BIGTOP-1508. fix Puppet warnings under Puppet 3 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/4da87e1d Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/4da87e1d Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/4da87e1d Branch: refs/heads/master Commit: 4da87e1d312d5a0f841e9a348a30763b5fb99759 Parents: 940b6fd Author: evans_ye <[email protected]> Authored: Fri Jan 9 00:34:09 2015 +0800 Committer: Evans Ye <[email protected]> Committed: Fri Jan 9 15:32:45 2015 +0000 ---------------------------------------------------------------------- bigtop-deploy/puppet/manifests/site.pp | 7 +++++++ bigtop-deploy/puppet/modules/hue/templates/hue.ini | 6 +++--- bigtop-deploy/puppet/modules/solr/templates/solr | 12 ++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/4da87e1d/bigtop-deploy/puppet/manifests/site.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp index 805dbef..8997140 100644 --- a/bigtop-deploy/puppet/manifests/site.pp +++ b/bigtop-deploy/puppet/manifests/site.pp @@ -67,3 +67,10 @@ node default { } Yumrepo<||> -> Package<||> + +if versioncmp($::puppetversion,'3.6.1') >= 0 { + $allow_virtual_packages = hiera('allow_virtual_packages',false) + Package { + allow_virtual => $allow_virtual_packages, + } +} http://git-wip-us.apache.org/repos/asf/bigtop/blob/4da87e1d/bigtop-deploy/puppet/modules/hue/templates/hue.ini ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hue/templates/hue.ini b/bigtop-deploy/puppet/modules/hue/templates/hue.ini index c23ec19..232d138 100644 --- a/bigtop-deploy/puppet/modules/hue/templates/hue.ini +++ b/bigtop-deploy/puppet/modules/hue/templates/hue.ini @@ -464,7 +464,7 @@ [sqoop] # Sqoop server URL - server_url=<%= sqoop_url %> + server_url=<%= @sqoop_url %> ########################################################################### @@ -489,7 +489,7 @@ [hbase] # Comma-separated list of HBase Thrift servers for # clusters in the format of '(name|host:port)'. - hbase_clusters=(Bigtop|<%= hbase_thrift_url %>) + hbase_clusters=(Bigtop|<%= @hbase_thrift_url %>) # Hard limit of rows or columns per row fetched before truncating. ## truncate_limit = 500 @@ -502,7 +502,7 @@ [search] # URL of the Solr Server - solr_url=<%= solr_url %> + solr_url=<%= @solr_url %> # Requires FQDN in solr_url if enabled ## security_enabled=false http://git-wip-us.apache.org/repos/asf/bigtop/blob/4da87e1d/bigtop-deploy/puppet/modules/solr/templates/solr ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/solr/templates/solr b/bigtop-deploy/puppet/modules/solr/templates/solr index 0f17ee9..cd6c88e 100644 --- a/bigtop-deploy/puppet/modules/solr/templates/solr +++ b/bigtop-deploy/puppet/modules/solr/templates/solr @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. SOLR_LOG=/var/log/solr -SOLR_PORT="<%= port %>" -SOLR_ADMIN_PORT="<%= port_admin %>" -SOLR_ZK_ENSEMBLE="<%= zk %>/solr" -SOLR_HDFS_HOME=<%= root_url %>/solr +SOLR_PORT="<%= @port %>" +SOLR_ADMIN_PORT="<%= @port_admin %>" +SOLR_ZK_ENSEMBLE="<%= @zk %>/solr" +SOLR_HDFS_HOME=<%= @root_url %>/solr SOLR_HDFS_CONFIG=/etc/hadoop/conf <% if @kerberos_realm == "" %> @@ -25,9 +25,9 @@ SOLR_AUTHENTICATION_SIMPLE_ALLOW_ANON=true <% else %> SOLR_KERBEROS_ENABLED=true SOLR_KERBEROS_KEYTAB=/etc/solr.keytab -SOLR_KERBEROS_PRINCIPAL="solr/<%= fqdn %>@<%= kerberos_realm %>" +SOLR_KERBEROS_PRINCIPAL="solr/<%= @fqdn %>@<%= @kerberos_realm %>" SOLR_AUTHENTICATION_KERBEROS_KEYTAB=/etc/solr.keytab -SOLR_AUTHENTICATION_KERBEROS_PRINCIPAL="HTTP/<%= fqdn %>@<%= kerberos_realm %>" +SOLR_AUTHENTICATION_KERBEROS_PRINCIPAL="HTTP/<%= @fqdn %>@<%= @kerberos_realm %>" SOLR_AUTHENTICATION_KERBEROS_NAME_RULES=DEFAULT SOLR_AUTHENTICATION_JAAS_CONF=/etc/solr/conf/jaas.conf <% end %>
