diff --git a/.gitignore b/.gitignore index 866d82a..d1eddc9 100644 --- a/.gitignore +++ b/.gitignore @@ -61,4 +61,4 @@ Desktop.ini $RECYCLE.BIN/ .tar.gz -.idea \ No newline at end of file +.idea/ \ No newline at end of file diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 683bc9e..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -multi-vagrant-puppet-vms \ No newline at end of file diff --git a/.idea/dictionaries/gstafford.xml b/.idea/dictionaries/gstafford.xml deleted file mode 100644 index 29d3f96..0000000 --- a/.idea/dictionaries/gstafford.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - sakila - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index d821048..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8662aa9..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 3e9f4dd..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/multi-vagrant-puppet-vms.iml b/.idea/multi-vagrant-puppet-vms.iml deleted file mode 100644 index 53f5b3c..0000000 --- a/.idea/multi-vagrant-puppet-vms.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 85aa79e..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,430 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - File Watchers - - - GeneralJavaScript - - - HTML - - - JavaScript - - - XML - - - - - Bash - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - 1417877467130 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index b3a6dfa..f9593c1 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,10 @@ configuration files for alternate environments since the Vagrantfile is designed vagrant up # brings up all VMs vagrant ssh puppetmaster -sh /vagrant/bootstrap-master.sh # run bootstrap script - sh /vagrant/bootstrap-master.sh # run bootstrap script sudo service puppetmaster status # test that puppet master was installed sudo service puppetmaster stop -sudo puppet master --verbose --no-daemonize +sudo puppetmaster --verbose --no-daemonize # Ctrl+C to kill puppet master sudo service puppetmaster start sudo puppet cert list --all # check for 'puppet' cert diff --git a/bootstrap-master.sh b/bootstrap-master.sh index f6c7387..0b84f89 100644 --- a/bootstrap-master.sh +++ b/bootstrap-master.sh @@ -21,13 +21,14 @@ else echo "192.168.32.20 node02" | sudo tee --append /etc/hosts 2> /dev/null # Add optional alternate DNS names to /etc/puppet/puppet.conf - sudo sed -i 's/.*\[main\].*/&\ndns_alt_names = puppet,puppetvm,puppetvm.com/' /etc/puppet/puppet.conf + sudo sed -i 's/.*\[main\].*/&\ndns_alt_names = puppet/' /etc/puppet/puppet.conf # Install some initial puppet modules on Puppet Master server sudo puppet module install puppetlabs-ntp sudo puppet module install garethr-docker sudo puppet module install puppetlabs-git sudo puppet module install puppetlabs-vcsrepo + sudo puppet module install garystafford-fig # symlink manifest from Vagrant synced folder location ln -s /vagrant/site.pp /etc/puppet/manifests/site.pp