Update lib references #27

gusztavvargadr · Dec 5, 2016 · 26d2fe9 · 26d2fe9
1 parent 3e3d660
commit 26d2fe9
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 27 deletions.
diff --git a/src/playground/aspnet-core/Berksfile b/src/playground/aspnet-core/Berksfile
@@ -1,3 +1,3 @@
-instance_eval(File.read(File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/chef/Berksfile'))))
+instance_eval(File.read(File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/chef/gusztavvargadr/Berksfile'))))
 
-local_cookbooks('../../../lib/chef/cookbooks')
+local_cookbooks('../../../lib/chef/gusztavvargadr/cookbooks')
diff --git a/src/playground/aspnet-core/vagrant.yml b/src/playground/aspnet-core/vagrant.yml
@@ -21,13 +21,13 @@ vms:
       00-chef-solo:
         type: chef-solo
         recipes:
-          - gusztavvargadr_vagrant_aspnet_core::windows_1
+          - gusztavvargadr_aspnet_core::windows_1
       01-reload:
         type: reload
       02-chef-solo:
         type: chef-solo
         recipes:
-          - gusztavvargadr_vagrant_aspnet_core::windows_2
+          - gusztavvargadr_aspnet_core::windows_2
   ubuntu:
     box: ubuntu/trusty64
     network:
@@ -38,4 +38,4 @@ vms:
       00-chef-solo:
         type: chef-solo
         recipes:
-          - gusztavvargadr_vagrant_aspnet_core::ubuntu
+          - gusztavvargadr_aspnet_core::ubuntu
diff --git a/src/playground/octopus/Berksfile b/src/playground/octopus/Berksfile
@@ -1,3 +1,3 @@
-instance_eval(File.read(File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/chef/Berksfile'))))
+instance_eval(File.read(File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/chef/gusztavvargadr/Berksfile'))))
 
-local_cookbooks('../../../lib/chef/cookbooks')
+local_cookbooks('../../../lib/chef/gusztavvargadr/cookbooks')
diff --git a/src/playground/octopus/vagrant.yml b/src/playground/octopus/vagrant.yml
@@ -22,11 +22,13 @@ vms:
       00-chef-solo:
         type: chef-solo
         recipes:
-          - gusztavvargadr_vagrant_octopus::server
+          - gusztavvargadr_octopus::server
         attributes:
-          gusztavvargadr_vagrant_octopus:
+          gusztavvargadr_octopus:
             server:
               web_address: http://server.octopus.playground.vagrant.local:80/
+              web_username: vagrant
+              web_password: Vagrant42
               api_key: <%= ENV['OCTOPUS_VAGRANT_API_KEY'] %>
   tentacle:
     box: windows2012r2se-sql2014de-iis
@@ -39,9 +41,9 @@ vms:
       00-chef-solo:
         type: chef-solo
         recipes:
-          - gusztavvargadr_vagrant_octopus::tentacle
+          - gusztavvargadr_octopus::tentacle
         attributes:
-          gusztavvargadr_vagrant_octopus:
+          gusztavvargadr_octopus:
             tentacle:
               server_web_address: http://server.octopus.playground.vagrant.local:80/
               api_key: <%= ENV['OCTOPUS_VAGRANT_API_KEY'] %>
diff --git a/src/workstations/Berksfile b/src/workstations/Berksfile
@@ -1,3 +1,3 @@
-instance_eval(File.read(File.expand_path(File.join(File.dirname(__FILE__), '../../lib/chef/Berksfile'))))
+instance_eval(File.read(File.expand_path(File.join(File.dirname(__FILE__), '../../lib/chef/gusztavvargadr/Berksfile'))))
 
-local_cookbooks('../../lib/chef/cookbooks')
+local_cookbooks('../../lib/chef/gusztavvargadr/cookbooks')
diff --git a/src/workstations/README.md b/src/workstations/README.md
@@ -71,7 +71,7 @@ vms:
     provisioners:
       10-chef-solo-windows:
         attributes:
-          gusztavvargadr_vagrant_windows:
+          gusztavvargadr_windows:
             features:
               - TelnetClient
 ```
@@ -88,7 +88,7 @@ vms:
     provisioners:
       10-chef-solo-windows:
         attributes:
-          gusztavvargadr_vagrant_windows:
+          gusztavvargadr_windows:
             packages:
               Redgate DLM Automation Suite:
                 source: https://download.red-gate.com/DLMAutomationSuite.exe
@@ -105,7 +105,7 @@ vms:
     provisioners:
       10-chef-solo-windows:
         attributes:
-          gusztavvargadr_vagrant_windows:
+          gusztavvargadr_windows:
             chocolatey_packages:
               # Install the latest version of the package with the default options
               nuget.commandline:
@@ -129,7 +129,7 @@ vms:
     provisioners:
       30-chef-solo-profiles:
         attributes:
-          gusztavvargadr_vagrant_git:
+          gusztavvargadr_git:
             profiles:
               # Base url for all the repositories in this "profile" (you can define multiple ones)
               https://github.com:
@@ -156,7 +156,7 @@ vms:
     provisioners:
       30-chef-solo-profiles:
         attributes:
-          gusztavvargadr_vagrant_svn:
+          gusztavvargadr_svn:
             profiles:
               # Base url for all the repositories in this "profile" (you can define multiple ones)
               http://svn.apache.org/repos:
@@ -183,7 +183,7 @@ vms:
     provisioners:
       30-chef-solo-profiles:
         attributes:
-          gusztavvargadr_vagrant_nuget:
+          gusztavvargadr_nuget:
             profiles:
               # Feed url (you can define multiple ones)
               https://www.myget.org/F/identity/:

diff --git a/src/workstations/vagrant.yml b/src/workstations/vagrant.yml
@@ -14,9 +14,9 @@ vms:
       10-chef-solo-windows:
         type: chef-solo
         recipes:
-          - gusztavvargadr_vagrant_windows::default
+          - gusztavvargadr_windows::default
         attributes:
-          gusztavvargadr_vagrant_windows:
+          gusztavvargadr_windows:
             chocolatey_packages:
               git:
                 options: -params '"/GitAndUnixToolsOnPath"'
@@ -28,11 +28,11 @@ vms:
       30-chef-solo-profiles:
         type: chef-solo
         recipes:
-          - gusztavvargadr_vagrant_git::default
-          - gusztavvargadr_vagrant_svn::default
-          - gusztavvargadr_vagrant_nuget::default
+          - gusztavvargadr_git::default
+          - gusztavvargadr_svn::default
+          - gusztavvargadr_nuget::default
         attributes:
-          gusztavvargadr_vagrant_git:
+          gusztavvargadr_git:
             profiles:
               https://github.com:
                 checkout_directory_path: /Users/vagrant/Repos
@@ -43,7 +43,7 @@ vms:
     provisioners:
       10-chef-solo-windows:
         attributes:
-          gusztavvargadr_vagrant_windows:
+          gusztavvargadr_windows:
             chocolatey_packages:
               webpicmd:
   sql:
@@ -53,6 +53,6 @@ vms:
     provisioners:
       10-chef-solo-windows:
         attributes:
-          gusztavvargadr_vagrant_windows:
+          gusztavvargadr_windows:
             chocolatey_packages:
               chefdk: