Merge pull request #57 from cyberious/RenameComplete

Finish refactor to all methods as issue occurs while running against master

Author: Morgan Haskel

examples/database_full.pp

@@ -1,4 +1,8 @@
-mssql::database{ 'testdb_full':
+sqlserver::config{ 'MSSQLSERVER':
+  admin_user => 'sa',
+  admin_pass => 'Pupp3t1@',
+}
+sqlserver::database{ 'testdb_full':
   instance                         => 'MSSQLSERVER',
   containment                      => 'PARTIAL',
   compatibility                    => 110,

examples/init.pp

@@ -12,21 +12,21 @@
 $sapwd = 'Pupp3t1@'
 $instance_name = 'MSSQLSERVER'
 
-mssql_instance{ $instance_name:
+sqlserver_instance{ $instance_name:
   source                => 'E:/',
   security_mode         => 'SQL',
   sa_pwd                => $sapwd,
   features              => ['SQL'],
   sql_sysadmin_accounts => ['vagrant'],
 }
 
-mssql::config{ 'MSSQLSERVER':
+sqlserver::config{ 'MSSQLSERVER':
   admin_user => 'sa',
   admin_pass => 'Pupp3t1@',
   require    => Mssql_instance[$instance_name],
 }
-mssql::login{ 'padmin':
+
+sqlserver::login{ 'padmin':
   password => 'PadminP@ssw0rd1',
   instance => $instance_name,
-  require  => Mssql::Config[$instance_name],
 }

examples/sp_configure.pp

@@ -1,3 +1,8 @@
+sqlserver::config{ 'MSSQLSERVER':
+  admin_user => 'sa',
+  admin_pass => 'Pupp3t1@',
+  require    => Mssql_instance[$instance_name],
+}
 #Enable Filestream access on server
 mssql::sp_configure{ 'filestream access level':
   value => 1,

files/install_dot_net_35.ps1

@@ -0,0 +1,10 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib/puppet_x/sqlserver/server_helper'))
+
+module Puppet::Parser::Functions
+  newfunction(:sqlserver_is_domain_or_local_user, :type => :rvalue) do |args|
+    if args.length != 1
+      raise Puppet::ParseError, ("is_domain_or_local_user(): requires exactly 1 argument, you provided #{args.length}")
+    end
+    PuppetX::Sqlserver::ServerHelper.is_domain_or_local_user?(args[0], Facter.value(:hostname))
+  end
+end

files/run_discovery.ps1

@@ -11,7 +11,7 @@
 # @raise [Puppet::ParserError] Instance name can not start or end with underscore (_)
 #
 module Puppet::Parser::Functions
-  newfunction(:mssql_validate_instance_name, :docs => <<DOC) do |args|
+  newfunction(:sqlserver_validate_instance_name, :docs => <<DOC) do |args|
 Validate the MS SQL Instance name based on what Microsoft has set within the document located at
   http://msdn.microsoft.com/en-us/library/ms143531(v=sql.120).aspx
 DOC

files/sqlserver_management.psm1

@@ -1,5 +1,5 @@
 module Puppet::Parser::Functions
-  newfunction(:mssql_validate_on_off) do |args|
+  newfunction(:sqlserver_validate_on_off) do |args|
     if args.length != 1
       raise Puppet::ParseError, ("validate_on_off(): requires exactly 1 argument, you provided #{args.length}")
     end