diff options
| author | evans_ye <innovansye@gmail.com> | 2015-01-09 00:34:09 +0800 |
|---|---|---|
| committer | Evans Ye <evansye@apache.org> | 2015-01-09 15:32:45 +0000 |
| commit | 4da87e1d312d5a0f841e9a348a30763b5fb99759 (patch) | |
| tree | 7c484434293f4fcf3ef41bfcb6ebcf3a30d05891 /bigtop-deploy | |
| parent | 940b6fda26ad655d1f3972ff0b28d2d031a7ce44 (diff) | |
BIGTOP-1508. fix Puppet warnings under Puppet 3
Diffstat (limited to 'bigtop-deploy')
| -rw-r--r-- | bigtop-deploy/puppet/manifests/site.pp | 7 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/hue/templates/hue.ini | 6 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/solr/templates/solr | 12 |
3 files changed, 16 insertions, 9 deletions
diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp index 805dbef0..89971404 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, + } +} diff --git a/bigtop-deploy/puppet/modules/hue/templates/hue.ini b/bigtop-deploy/puppet/modules/hue/templates/hue.ini index c23ec19f..232d138f 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 diff --git a/bigtop-deploy/puppet/modules/solr/templates/solr b/bigtop-deploy/puppet/modules/solr/templates/solr index 0f17ee99..cd6c88ea 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 %> |