From c08f86281a40ad32b5ab386c88ed37f2292293fe Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sat, 11 May 2019 22:24:06 +0300 Subject: [PATCH 01/32] Revamping. Migration to Ubuntu 18.04, Puppet 5.4 and Newer Modules' Version. --- .gitignore | 6 +++ Gemfile.lock | 86 ------------------------------------------ Puppetfile | 37 +++++++++++------- Puppetfile.lock | 54 -------------------------- Vagrantfile | 2 +- hieradata/common.yaml | 5 ++- hieradata/swarm-1.yaml | 2 +- manifests/base.pp | 4 +- scripts/puppet.sh | 24 ++++-------- 9 files changed, 43 insertions(+), 177 deletions(-) delete mode 100644 Gemfile.lock delete mode 100644 Puppetfile.lock diff --git a/.gitignore b/.gitignore index 2984609..db9ca40 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,9 @@ .tmp .bundle vendor/**/ +.Vagrantfile.swp +.librarian +*.log +*.lock +modules +vendor diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 92d5bce..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,86 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (2.2.8) - activemodel (4.2.0) - activesupport (= 4.2.0) - builder (~> 3.1) - activesupport (4.2.0) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - builder (3.2.2) - diff-lcs (1.2.5) - facter (2.4.1) - CFPropertyList (~> 2.2.6) - faraday (0.9.1) - multipart-post (>= 1.2, < 3) - her (0.7.3) - activemodel (>= 3.0.0, <= 4.2) - activesupport (>= 3.0.0, <= 4.2) - faraday (>= 0.8, < 1.0) - multi_json (~> 1.7) - hiera (1.3.4) - json_pure - highline (1.6.21) - i18n (0.7.0) - json (1.8.2) - json_pure (1.8.2) - librarian (0.1.2) - highline - thor (~> 0.15) - librarian-puppet (2.0.1) - librarian (>= 0.1.2) - puppet_forge - rsync - minitest (5.5.1) - multi_json (1.10.1) - multipart-post (2.0.0) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (2.9.2) - puppet (3.7.4) - facter (> 1.6, < 3) - hiera (~> 1.0) - json_pure - puppet_forge (1.0.4) - her (~> 0.6) - rspec (3.2.0) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-core (3.2.0) - rspec-support (~> 3.2.0) - rspec-expectations (3.2.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-its (1.1.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) - rspec-mocks (3.2.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-support (3.2.1) - rsync (1.0.9) - serverspec (2.8.2) - multi_json - rspec (~> 3.0) - rspec-its - specinfra (~> 2.12) - specinfra (2.13.1) - net-scp - net-ssh - thor (0.19.1) - thread_safe (0.3.4) - tzinfo (1.2.2) - thread_safe (~> 0.1) - -PLATFORMS - ruby - -DEPENDENCIES - librarian-puppet - puppet - serverspec diff --git a/Puppetfile b/Puppetfile index 569fa8d..25c1555 100644 --- a/Puppetfile +++ b/Puppetfile @@ -1,22 +1,31 @@ forge "https://forgeapi.puppetlabs.com" -mod 'camptocamp/archive' +#mod 'camptocamp-archive', '0.9.0' +mod 'puppet-archive', '3.2.1' +mod 'camptocamp-systemd', '2.4.0' -mod 'puppetlabs/apt' -mod 'puppetlabs/git' -mod 'puppetlabs/stdlib' +mod 'puppetlabs-apt', '6.3.0' +mod 'puppetlabs-git', '0.5.0' +mod 'puppetlabs-stdlib', '5.2.0' +mod 'puppetlabs-concat', '5.3.0' +mod 'puppetlabs-powershell', '2.3.0' +mod 'puppetlabs-inifile', '2.5.0' +mod 'puppetlabs-translate', '1.2.0' +mod 'puppetlabs-docker', '3.5.0' +mod 'puppetlabs-reboot', '2.1.2' -mod 'saz/locales' -mod 'saz/sudo' -mod 'saz/limits' -mod 'saz/motd' -mod 'saz/timezone' -mod 'saz/ssh' +mod 'saz-locales', '2.5.1' +mod 'saz-sudo', '6.0.0' +mod 'saz-motd', '2.4.0' +mod 'saz-timezone', '5.1.1' +mod 'saz-ssh', '5.0.0' -mod 'attachmentgenie/ufw' +mod 'stm-debconf', '2.3.0' -mod 'andschwa/unattended_upgrades' +mod 'attachmentgenie-ufw', '1.4.9' -mod 'garethr/docker', :git => 'https://github.com/garethr/garethr-docker.git' +mod 'andschwa-unattended_upgrades', '0.2.3' -mod 'KyleAnderson/consul' +mod 'stahnma-epel', '1.3.1' + +mod 'KyleAnderson-consul', '5.0.3' diff --git a/Puppetfile.lock b/Puppetfile.lock deleted file mode 100644 index f958adb..0000000 --- a/Puppetfile.lock +++ /dev/null @@ -1,54 +0,0 @@ -FORGE - remote: https://forgeapi.puppetlabs.com - specs: - KyleAnderson-consul (0.4.6) - nanliu-staging (>= 0.4.0) - puppetlabs-stdlib (>= 0.1.6) - andschwa-unattended_upgrades (0.1.2) - attachmentgenie-ufw (1.4.9) - puppetlabs-stdlib (>= 2.2.1) - camptocamp-archive (0.3.6) - nanliu-staging (1.0.3) - puppetlabs-apt (1.7.0) - puppetlabs-stdlib (>= 2.2.1) - puppetlabs-git (0.3.0) - puppetlabs-vcsrepo (>= 0.1.0) - puppetlabs-stdlib (4.5.1) - puppetlabs-vcsrepo (1.2.0) - saz-limits (2.1.0) - saz-locales (2.2.0) - saz-motd (2.2.0) - saz-ssh (2.4.0) - puppetlabs-stdlib (>= 2.2.1) - saz-sudo (3.0.9) - puppetlabs-stdlib (>= 2.3.0) - saz-timezone (3.1.1) - puppetlabs-stdlib (>= 2.3.0) - stahnma-epel (1.0.2) - -GIT - remote: https://github.com/garethr/garethr-docker.git - ref: master - sha: 29fd6c26464f0e8599e9604fd549c264effd1d27 - specs: - garethr-docker (3.3.2) - puppetlabs-apt (>= 1.1.0) - puppetlabs-stdlib (>= 4.1.0) - stahnma-epel (>= 0.0.6) - -DEPENDENCIES - KyleAnderson-consul (>= 0) - andschwa-unattended_upgrades (>= 0) - attachmentgenie-ufw (>= 0) - camptocamp-archive (>= 0) - garethr-docker (>= 0) - puppetlabs-apt (>= 0) - puppetlabs-git (>= 0) - puppetlabs-stdlib (>= 0) - saz-limits (>= 0) - saz-locales (>= 0) - saz-motd (>= 0) - saz-ssh (>= 0) - saz-sudo (>= 0) - saz-timezone (>= 0) - diff --git a/Vagrantfile b/Vagrantfile index 32fbad3..5e5cc1f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -15,7 +15,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define name do |instance| instance.vm.hostname = name - instance.vm.box = "ubuntu/trusty64" + instance.vm.box = "ubuntu/bionic64" instance.vm.provision :shell, :path => 'scripts/puppet.sh' instance.vm.provision :hosts instance.vm.provision :puppet do |puppet| diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 0c343be..2775098 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -10,10 +10,11 @@ classes: - git - docker - consul -timezone::timezone: 'UTC' + +timezone::timezone: 'EET' unattended_upgrades::autoremove: true docker::tcp_bind: tcp://0.0.0.0:2375 consul::config_hash: data_dir: '/opt/consul' client_addr: '0.0.0.0' - bind_addr: "%{::ipaddress_eth1}" + bind_addr: "%{facts.networking.ip}" diff --git a/hieradata/swarm-1.yaml b/hieradata/swarm-1.yaml index 63dc79b..238a71b 100644 --- a/hieradata/swarm-1.yaml +++ b/hieradata/swarm-1.yaml @@ -3,5 +3,5 @@ consul::config_hash: server: true data_dir: '/opt/consul' client_addr: '0.0.0.0' - bind_addr: "%{::ipaddress_eth1}" + bind_addr: "%{facts.networking.ip}" bootstrap: true diff --git a/manifests/base.pp b/manifests/base.pp index 1ca7947..b7bfb95 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -14,7 +14,7 @@ ::docker::run { 'swarm': image => 'swarm', - command => "join --addr=${::ipaddress_eth1}:2375 consul://${::ipaddress_eth1}:8500/swarm_nodes" + command => 'join --addr="%{facts.networking.ip}":2375 consul://"%{facts.networking.ip}":8500/swarm_nodes' } } @@ -25,7 +25,7 @@ ::docker::run { 'swarm-manager': image => 'swarm', ports => '3000:2375', - command => "manage consul://${::ipaddress_eth1}:8500/swarm_nodes", + command => 'manage consul://"%{facts.networking.ip}":8500/swarm_nodes', require => Docker::Run['swarm'], } diff --git a/scripts/puppet.sh b/scripts/puppet.sh index aa7058b..02b676f 100755 --- a/scripts/puppet.sh +++ b/scripts/puppet.sh @@ -12,23 +12,13 @@ if which /usr/local/bin/puppet > /dev/null 2>&1; then exit 0 fi -# Ruby on Ubuntu is broken by design :( -echo -e "----> ${green}Installing ruby${end}" +# Update Pkg Manager Data sudo apt-get update -sudo apt-get install ruby2.0 ruby2.0-dev -y -for i in erb gem irb rake rdoc ri ruby testrb -do - sudo ln -sf /usr/bin/${i}2.0 /usr/bin/${i} -done -# Required for installing signed packages -sudo apt-get install debian-keyring debian-archive-keyring -y +# Install puppet/facter/ruby +echo -e "----> ${green}Installing Puppet and Ruby ${end}" +sudo apt-get install -y puppet facter ruby -# Install language locale as without can -# interfere with package installation -sudo apt-get install language-pack-en -y - -# Install puppet/facter -echo -e "----> ${green}Installing puppet${end}" -sudo gem install puppet -v 3.7.5 --no-ri --no-rdoc -sudo gem install facter --no-ri --no-rdoc +#sudo gem update --system +#sudo gem install puppet -v 6.4.0 +#sudo gem install facter \ No newline at end of file From ccfa1f14b272c453dd61dd7b306543aecbf1f10f Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sat, 11 May 2019 22:27:20 +0300 Subject: [PATCH 02/32] Update puppet.sh --- scripts/puppet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/puppet.sh b/scripts/puppet.sh index 02b676f..0b9de7f 100755 --- a/scripts/puppet.sh +++ b/scripts/puppet.sh @@ -21,4 +21,4 @@ sudo apt-get install -y puppet facter ruby #sudo gem update --system #sudo gem install puppet -v 6.4.0 -#sudo gem install facter \ No newline at end of file +#sudo gem install facter From 14525a41c28f6b8dc7c40719b449a32fc1c46e1a Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 00:16:17 +0300 Subject: [PATCH 03/32] Fix Netw Int. Improve Fmt. --- hieradata/common.yaml | 2 +- hieradata/swarm-1.yaml | 2 +- manifests/base.pp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 2775098..ab2b279 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -17,4 +17,4 @@ docker::tcp_bind: tcp://0.0.0.0:2375 consul::config_hash: data_dir: '/opt/consul' client_addr: '0.0.0.0' - bind_addr: "%{facts.networking.ip}" + bind_addr: "%{networking.interfaces.enp0s8.ip}" diff --git a/hieradata/swarm-1.yaml b/hieradata/swarm-1.yaml index 238a71b..902c92e 100644 --- a/hieradata/swarm-1.yaml +++ b/hieradata/swarm-1.yaml @@ -3,5 +3,5 @@ consul::config_hash: server: true data_dir: '/opt/consul' client_addr: '0.0.0.0' - bind_addr: "%{facts.networking.ip}" + bind_addr: "%{networking.interfaces.enp0s8.ip}" bootstrap: true diff --git a/manifests/base.pp b/manifests/base.pp index b7bfb95..7ecd761 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -14,7 +14,7 @@ ::docker::run { 'swarm': image => 'swarm', - command => 'join --addr="%{facts.networking.ip}":2375 consul://"%{facts.networking.ip}":8500/swarm_nodes' + command => 'join --addr="%{networking.interfaces.enp0s8.ip}":2375 consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', } } @@ -25,7 +25,7 @@ ::docker::run { 'swarm-manager': image => 'swarm', ports => '3000:2375', - command => 'manage consul://"%{facts.networking.ip}":8500/swarm_nodes', + command => 'manage consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', require => Docker::Run['swarm'], } From c28cc358a3a6456a33322ae2e701c2ebb0552c1c Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 00:19:10 +0300 Subject: [PATCH 04/32] Fix Spelling Mistakes. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1275ec5..70ccc21 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Docker orchestration effort, and allows for managing containers across a fleet of hosts rather than just on a single host. The [Puppet Docker module](https://forge.puppetlabs.com/garethr/docker) -supports installing and managing Docker, and running individual docker +supports installing and managing Docker, and running individual Docker containers. Given Swarm is packaged as containers, that means we can install a Swarm cluster using Puppet. @@ -21,12 +21,12 @@ Puppet. This will launch 2 virtual machines, install Consul and register a cluster, install Docker and Swarm and then establish the swarm. -You can access the swwarm using a docker client, either from you local +You can access the Swarm using a Docker client, either from you local machine or from one of the virtual machines. For instance: docker -H tcp://10.20.3.11:3000 info -If you don't have docker installed locally you can run the above command +If you don't have Docker installed locally you can run the above command from one of the virtual machines using: vagrant ssh swarm-1 -c "docker -H tcp://localhost:3000 info" From 76396a3861228483d28400265d9e778810748756 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 13:10:23 +0300 Subject: [PATCH 05/32] Add dnsmasq, gliderlabs/registrator and consul ui --- Gemfile | 9 ++++--- Puppetfile | 1 + README.md | 35 +++++++++++++++++++++++++++ hieradata/common.yaml | 4 ++- hieradata/swarm-1.yaml | 1 + manifests/base.pp | 55 +++++++++++++++++++++++++++++++++--------- 6 files changed, 88 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 9877622..63e1d5c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ -source "https://rubygems.org" +source 'https://rubygems.org' -gem "librarian-puppet" -gem "puppet" -gem "serverspec" +gem 'librarian-puppet' +gem 'puppet' +gem 'serverspec' +gem 'vagrant-wrapper' diff --git a/Puppetfile b/Puppetfile index 25c1555..d7e873b 100644 --- a/Puppetfile +++ b/Puppetfile @@ -19,6 +19,7 @@ mod 'saz-sudo', '6.0.0' mod 'saz-motd', '2.4.0' mod 'saz-timezone', '5.1.1' mod 'saz-ssh', '5.0.0' +mod 'saz-dnsmasq', '1.4.0' mod 'stm-debconf', '2.3.0' diff --git a/README.md b/README.md index 70ccc21..bc97fd9 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,41 @@ something like: └ Reserved Memory: 0 B / 490 MiB +## The Tour + +Quick recap on consul API - create + + # docker run -d -p 8080:8080 --name="hello" mrbarker/python-flask-hello + # docker run -d -p 8081:8080 -p 8443:8443 --name="hello2" mrbarker/python-flask-hello + + + # docker logs registrator + +This demonstrates the automatic registration of services into consul. The +following shows the registration and the subsequent DNS requests. + + # curl localhost:8500/v1/catalog/services + {"consul":[],"python-flask-hello":[],"python-flask-hello-8080":[],"python-flask-hello-8443":[],"swarm":[]} + + # curl localhost:8500/v1/catalog/nodes + [{"Node":"swarm-1","Address":"10.20.3.11"}] + +Check DNS by appending .service.consul to the service names, + + # dig python-flask-hello-8443.service.consul +short + 172.17.0.5 + # dig python-flask-hello-8443.service.consul -t srv +short + 1 1 8443 swarm-1.node.dc1.consul. + # dig python-flask-hello-8443.service.consul -t srv +short + +Reverse DNS - (XXX double check long vs short name returned) + + # dig swarm-1.node.dc1.consul +short + 10.20.3.11 + # dig -x 10.20.3.11 +short + swarm-1. + + ## Implementation details The example uses the Docker module to launch the swarm containers. First diff --git a/hieradata/common.yaml b/hieradata/common.yaml index ab2b279..4366e9a 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -11,10 +11,12 @@ classes: - docker - consul -timezone::timezone: 'EET' +timezone::timezone: 'UTC' unattended_upgrades::autoremove: true +docker::extra_parameters: '--cluster-store consul://"%{networking.interfaces.enp0s8.ip}":8500 --cluster-advertise "%{networking.interfaces.enp0s8.ip}":0' docker::tcp_bind: tcp://0.0.0.0:2375 consul::config_hash: + ui_dir: '/opt/consul/ui' data_dir: '/opt/consul' client_addr: '0.0.0.0' bind_addr: "%{networking.interfaces.enp0s8.ip}" diff --git a/hieradata/swarm-1.yaml b/hieradata/swarm-1.yaml index 902c92e..31d5f20 100644 --- a/hieradata/swarm-1.yaml +++ b/hieradata/swarm-1.yaml @@ -1,6 +1,7 @@ --- consul::config_hash: server: true + ui_dir: '/opt/consul/ui' data_dir: '/opt/consul' client_addr: '0.0.0.0' bind_addr: "%{networking.interfaces.enp0s8.ip}" diff --git a/manifests/base.pp b/manifests/base.pp index 7ecd761..3018d3d 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,3 +1,5 @@ +# Base class for all nodes in the swarm +# class base { hiera_include('classes') @@ -7,32 +9,61 @@ } file { '/etc/update-motd.d': - purge => true + purge => true, } - ::docker::image { 'swarm': } + ::docker::image { 'swarm:latest': } + ::docker::image { 'busybox': } + ::docker::image { 'gliderlabs/registrator:latest': } ::docker::run { 'swarm': - image => 'swarm', - command => 'join --addr="%{networking.interfaces.enp0s8.ip}":2375 consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', + image => 'swarm:latest', + command => 'join --addr="%{networking.interfaces.enp0s8.ip}":2375 consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', + extra_parameters => '--name swarm', + require => Class['docker::service'], + } + ::docker::run { 'registrator': + image => 'gliderlabs/registrator:latest', + volumes => [ '/var/run/docker.sock:/tmp/docker.sock' ], + command => 'consul://"%{networking.interfaces.enp0s8.ip}":8500', + extra_parameters => '--name registrator', + require => Class['docker::service'], + } + + # Ensure dnsmasq is installed after package work for consul and docker; + # otherwise DNS resolution issues if dnsmasq is installed but service hasn't + # started yet; affects further package installations. + class { '::dnsmasq': + require => [ + Class['consul'], + Class['docker'], + ], + } + dnsmasq::conf { 'consul': + ensure => present, + content => 'server=/consul/127.0.0.1#8600', } -} + package{'unzip': + ensure => present, + before => Class['consul'], + } +} node 'swarm-1' { - include base + include ::base ::docker::run { 'swarm-manager': - image => 'swarm', - ports => '3000:2375', - command => 'manage consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', - require => Docker::Run['swarm'], + image => 'swarm', + ports => '3000:2375', + command => 'manage consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', + extra_parameters => '--name swarm-manager', + require => Class['docker::service'], } - } node default { - include base + include ::base exec { 'consul join swarm-1': path => '/usr/local/bin/', From 7d7b5a2ba58a6806ea89556c9e66ea189ae26914 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 16:58:44 +0300 Subject: [PATCH 06/32] Improve Fmt. Use CET Time Zone. --- README.md | 19 +++++++++---------- hieradata/common.yaml | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index bc97fd9..542869c 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ Check DNS by appending .service.consul to the service names, 1 1 8443 swarm-1.node.dc1.consul. # dig python-flask-hello-8443.service.consul -t srv +short -Reverse DNS - (XXX double check long vs short name returned) +Reverse DNS - (XXX double check long vs. short name returned) # dig swarm-1.node.dc1.consul +short 10.20.3.11 @@ -113,31 +113,30 @@ Reverse DNS - (XXX double check long vs short name returned) ## Implementation details -The example uses the Docker module to launch the swarm containers. First -we run the main swarm container on all hosts. +The example uses the Docker module to launch the swarm containers. + +First, we run the main swarm container on all hosts: ```puppet ::docker::run { 'swarm': image => 'swarm', - command => "join --addr=${::ipaddress_eth1}:2375 consul://${::ipaddress_eth1}:8500/swarm_nodes" + command => 'join --addr="%{networking.interfaces.enp0s8.ip}":2375 consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes' } ``` -Then on one host we run the swarm manager: +Then, on one host we run the Swarm Manager: ```puppet ::docker::run { 'swarm-manager': image => 'swarm', ports => '3000:2375', - command => "manage consul://${::ipaddress_eth1}:8500/swarm_nodes", + command => 'manage consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', require => Docker::Run['swarm'], } ``` -Consul is managed by the excellent [Consul -module](https://github.com/solarkennedy) from [Kyle -Anderson](https://github.com/solarkennedy). Much of the Consul -configuration is in the hiera data, for example: +Consul is managed by the excellent [Consul module](https://github.com/solarkennedy) from [Kyle +Anderson](https://github.com/solarkennedy). Much of the Consul configuration is in the hiera data, for example: ```yaml consul::config_hash: diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 4366e9a..44fc7ec 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -11,7 +11,7 @@ classes: - docker - consul -timezone::timezone: 'UTC' +timezone::timezone: 'CET' unattended_upgrades::autoremove: true docker::extra_parameters: '--cluster-store consul://"%{networking.interfaces.enp0s8.ip}":8500 --cluster-advertise "%{networking.interfaces.enp0s8.ip}":0' docker::tcp_bind: tcp://0.0.0.0:2375 From 4a7630e7d728de4576a6171508104d2c2bb4fb32 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 17:01:54 +0300 Subject: [PATCH 07/32] Fix Spelling Errs. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 542869c..2a534d7 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ something like: ## The Tour -Quick recap on consul API - create +Quick recap on Consul API - create # docker run -d -p 8080:8080 --name="hello" mrbarker/python-flask-hello # docker run -d -p 8081:8080 -p 8443:8443 --name="hello2" mrbarker/python-flask-hello @@ -86,7 +86,7 @@ Quick recap on consul API - create # docker logs registrator -This demonstrates the automatic registration of services into consul. The +This demonstrates the automatic registration of services into Consul. The following shows the registration and the subsequent DNS requests. # curl localhost:8500/v1/catalog/services From 80d5131fe2f87989c1ad2b1124df92f22b277837 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 17:02:43 +0300 Subject: [PATCH 08/32] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2a534d7..3e9c04d 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ following shows the registration and the subsequent DNS requests. # curl localhost:8500/v1/catalog/nodes [{"Node":"swarm-1","Address":"10.20.3.11"}] -Check DNS by appending .service.consul to the service names, +Check DNS by appending .service.consul to the service names: # dig python-flask-hello-8443.service.consul +short 172.17.0.5 @@ -103,7 +103,7 @@ Check DNS by appending .service.consul to the service names, 1 1 8443 swarm-1.node.dc1.consul. # dig python-flask-hello-8443.service.consul -t srv +short -Reverse DNS - (XXX double check long vs. short name returned) +Reverse DNS - (XXX double check long vs. short name returned): # dig swarm-1.node.dc1.consul +short 10.20.3.11 From a28a1456f5ac825ef64b2e4cf0c4a915b252b15c Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 17:04:05 +0300 Subject: [PATCH 09/32] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3e9c04d..56cbb19 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Puppet. vagrant up --provider virtualbox This will launch 2 virtual machines, install Consul and register a -cluster, install Docker and Swarm and then establish the swarm. +cluster, install Docker and Swarm and then establish the Swarm. You can access the Swarm using a Docker client, either from you local machine or from one of the virtual machines. For instance: @@ -113,9 +113,9 @@ Reverse DNS - (XXX double check long vs. short name returned): ## Implementation details -The example uses the Docker module to launch the swarm containers. +The example uses the Docker module to launch the Swarm containers. -First, we run the main swarm container on all hosts: +First, we run the main Swarm container on all hosts: ```puppet ::docker::run { 'swarm': From 09c8398b4a0ccfdc08d2e56078206564eb857494 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 17:05:12 +0300 Subject: [PATCH 10/32] Remove Unneeded Imgs. --- manifests/base.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/base.pp b/manifests/base.pp index 3018d3d..b8f36ac 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -13,7 +13,6 @@ } ::docker::image { 'swarm:latest': } - ::docker::image { 'busybox': } ::docker::image { 'gliderlabs/registrator:latest': } ::docker::run { 'swarm': From 39340764e074f25a80aa4cfe4a0130c5815daa0a Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 18:01:48 +0300 Subject: [PATCH 11/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56cbb19..819c9d6 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ First, we run the main Swarm container on all hosts: ```puppet ::docker::run { 'swarm': image => 'swarm', - command => 'join --addr="%{networking.interfaces.enp0s8.ip}":2375 consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes' + command => 'join --addr="%{networking.interfaces.enp0s8.ip}":2375 consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', } ``` From df1493eb1f098daff6df4e99e424d369cdc5026e Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 19:00:36 +0300 Subject: [PATCH 12/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 819c9d6..7318252 100644 --- a/README.md +++ b/README.md @@ -142,5 +142,5 @@ Anderson](https://github.com/solarkennedy). Much of the Consul configuration is consul::config_hash: data_dir: '/opt/consul' client_addr: '0.0.0.0' - bind_addr: "%{::ipaddress_eth1}" + bind_addr: "%{networking.interfaces.enp0s8.ip}" ``` From ea8e20064bcf3f73c34b90fb329e41ff3b99ba75 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 19:57:20 +0300 Subject: [PATCH 13/32] Fix Var Syntax Interpolation. Remove Unneeded Modules. --- Puppetfile | 1 - manifests/base.pp | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Puppetfile b/Puppetfile index d7e873b..02f68ab 100644 --- a/Puppetfile +++ b/Puppetfile @@ -1,6 +1,5 @@ forge "https://forgeapi.puppetlabs.com" -#mod 'camptocamp-archive', '0.9.0' mod 'puppet-archive', '3.2.1' mod 'camptocamp-systemd', '2.4.0' diff --git a/manifests/base.pp b/manifests/base.pp index b8f36ac..74aa427 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -17,20 +17,20 @@ ::docker::run { 'swarm': image => 'swarm:latest', - command => 'join --addr="%{networking.interfaces.enp0s8.ip}":2375 consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', + command => 'join --addr="${facts['networking']['interfaces']['enp0s8']['ip']}":2375 consul://"${facts['networking']['interfaces']['enp0s8']['ip']}":8500/swarm_nodes', extra_parameters => '--name swarm', require => Class['docker::service'], } ::docker::run { 'registrator': image => 'gliderlabs/registrator:latest', volumes => [ '/var/run/docker.sock:/tmp/docker.sock' ], - command => 'consul://"%{networking.interfaces.enp0s8.ip}":8500', + command => 'consul://"${facts['networking']['interfaces']['enp0s8']['ip']}":8500', extra_parameters => '--name registrator', require => Class['docker::service'], } - # Ensure dnsmasq is installed after package work for consul and docker; - # otherwise DNS resolution issues if dnsmasq is installed but service hasn't + # Ensure dnsmasq is installed after completing the package installation for Consul and Docker; + # Otherwise, DNS resolution issues occur if dnsmasq is installed but their services haven't # started yet; affects further package installations. class { '::dnsmasq': require => [ @@ -55,7 +55,7 @@ ::docker::run { 'swarm-manager': image => 'swarm', ports => '3000:2375', - command => 'manage consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', + command => 'manage consul://"${facts['networking']['interfaces']['enp0s8']['ip']}":8500/swarm_nodes', extra_parameters => '--name swarm-manager', require => Class['docker::service'], } From 0b42c4ce3016c69f1e2723fa12f30b23934c35e2 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:00:09 +0300 Subject: [PATCH 14/32] Double Quotes Instead of Single --- manifests/base.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/base.pp b/manifests/base.pp index 74aa427..c9d2e19 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -17,14 +17,14 @@ ::docker::run { 'swarm': image => 'swarm:latest', - command => 'join --addr="${facts['networking']['interfaces']['enp0s8']['ip']}":2375 consul://"${facts['networking']['interfaces']['enp0s8']['ip']}":8500/swarm_nodes', + command => "join --addr=${facts['networking']['interfaces']['enp0s8']['ip']}:2375 consul://${facts['networking']['interfaces']['enp0s8']['ip']}:8500/swarm_nodes", extra_parameters => '--name swarm', require => Class['docker::service'], } ::docker::run { 'registrator': image => 'gliderlabs/registrator:latest', volumes => [ '/var/run/docker.sock:/tmp/docker.sock' ], - command => 'consul://"${facts['networking']['interfaces']['enp0s8']['ip']}":8500', + command => "consul://${facts['networking']['interfaces']['enp0s8']['ip']}:8500", extra_parameters => '--name registrator', require => Class['docker::service'], } @@ -55,7 +55,7 @@ ::docker::run { 'swarm-manager': image => 'swarm', ports => '3000:2375', - command => 'manage consul://"${facts['networking']['interfaces']['enp0s8']['ip']}":8500/swarm_nodes', + command => "manage consul://${facts['networking']['interfaces']['enp0s8']['ip']}:8500/swarm_nodes", extra_parameters => '--name swarm-manager', require => Class['docker::service'], } From 6f981f308c4d3ce51e2ba3456a5e9f2a2b464275 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:08:32 +0300 Subject: [PATCH 15/32] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7318252..90a77bb 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ First, we run the main Swarm container on all hosts: ```puppet ::docker::run { 'swarm': image => 'swarm', - command => 'join --addr="%{networking.interfaces.enp0s8.ip}":2375 consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', + command => "join --addr=${facts['networking']['interfaces']['enp0s8']['ip']}:2375 consul://${facts['networking']['interfaces']['enp0s8']['ip']}:8500/swarm_nodes", } ``` @@ -130,7 +130,7 @@ Then, on one host we run the Swarm Manager: ::docker::run { 'swarm-manager': image => 'swarm', ports => '3000:2375', - command => 'manage consul://"%{networking.interfaces.enp0s8.ip}":8500/swarm_nodes', + command => "manage consul://${facts['networking']['interfaces']['enp0s8']['ip']}:8500/swarm_nodes", require => Docker::Run['swarm'], } ``` From 892befbd973e7f4ca6822104ed6e3aa90cdb8235 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:10:01 +0300 Subject: [PATCH 16/32] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index db9ca40..eec381f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .tmp .bundle vendor/**/ -.Vagrantfile.swp +*.swp .librarian *.log *.lock From 2a882ba4dcce0d591470d8a48407fbac1cbb7699 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:15:30 +0300 Subject: [PATCH 17/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90a77bb..ea64d84 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ something like: ## The Tour -Quick recap on Consul API - create +Quick recap on Consul API - create a new service: # docker run -d -p 8080:8080 --name="hello" mrbarker/python-flask-hello # docker run -d -p 8081:8080 -p 8443:8443 --name="hello2" mrbarker/python-flask-hello From 088c960207c1f131590d3a629cc7926769dd6a1a Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:16:02 +0300 Subject: [PATCH 18/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ea64d84..5592c8d 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ something like: ## The Tour -Quick recap on Consul API - create a new service: +Quick recap on Consul API - create two new services: # docker run -d -p 8080:8080 --name="hello" mrbarker/python-flask-hello # docker run -d -p 8081:8080 -p 8443:8443 --name="hello2" mrbarker/python-flask-hello From 613f9bd234152bb55504b7d1fb9eba5902a8fd33 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:18:21 +0300 Subject: [PATCH 19/32] Update puppet.sh --- scripts/puppet.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/puppet.sh b/scripts/puppet.sh index 0b9de7f..4f6d02f 100755 --- a/scripts/puppet.sh +++ b/scripts/puppet.sh @@ -18,7 +18,3 @@ sudo apt-get update # Install puppet/facter/ruby echo -e "----> ${green}Installing Puppet and Ruby ${end}" sudo apt-get install -y puppet facter ruby - -#sudo gem update --system -#sudo gem install puppet -v 6.4.0 -#sudo gem install facter From 454d11aca48cd5eb61147afd95f3cec1e430855a Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:26:40 +0300 Subject: [PATCH 20/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5592c8d..c6234cb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Using Puppet to launch a Docker Swarm +# Using Puppet to Launch a Docker Swarm Cluster [Docker Swarm](https://docs.docker.com/swarm/) is part of the official Docker orchestration effort, and allows for managing containers across a From 71c25f3e309e54099248aa7fd3a4ffb0310e47c2 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:28:09 +0300 Subject: [PATCH 21/32] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c6234cb..a3129a0 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ Puppet. vagrant up --provider virtualbox This will launch 2 virtual machines, install Consul and register a -cluster, install Docker and Swarm and then establish the Swarm. +cluster, install Docker and Swarm and then establish the swarm. -You can access the Swarm using a Docker client, either from you local +You can access the swarm using a Docker client, either from you local machine or from one of the virtual machines. For instance: docker -H tcp://10.20.3.11:3000 info From 8b2f97083a7e2ce066c21f50034576e805cff46b Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:39:46 +0300 Subject: [PATCH 22/32] Update README.md --- README.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a3129a0..9e2bec6 100644 --- a/README.md +++ b/README.md @@ -33,16 +33,54 @@ from one of the virtual machines using: This should print something like: - Containers: 4 + Containers: 5 + Running: 5 + Paused: 0 + Stopped: 0 + Images: 4 + Server Version: swarm/1.2.9 + Role: primary + Strategy: spread + Filters: health, port, containerslots, dependency, affinity, constraint, whitelist Nodes: 2 - swarm-1: 10.20.3.11:2375 - └ Containers: 3 - └ Reserved CPUs: 0 / 1 - └ Reserved Memory: 0 B / 490 MiB - swarm-2: 10.20.3.12:2375 - └ Containers: 1 - └ Reserved CPUs: 0 / 1 - └ Reserved Memory: 0 B / 490 MiB + swarm-1: 10.20.3.11:2375 + └ ID: LBE4:VBSS:MLT3:S2BG:P7BP:H2I3:E2NM:DTNR:Z3V5:VZG7:H6G2:KFIW|10.20.3.11:2375 + └ Status: Healthy + └ Containers: 3 (3 Running, 0 Paused, 0 Stopped) + └ Reserved CPUs: 0 / 2 + └ Reserved Memory: 0 B / 1.01 GiB + └ Labels: kernelversion=4.15.0-48-generic, operatingsystem=Ubuntu 18.04.2 LTS, ostype=linux, storagedriver=overlay2 + └ UpdatedAt: 2019-05-12T17:38:13Z + └ ServerVersion: 18.09.6 + swarm-2: 10.20.3.12:2375 + └ ID: RVWC:SZWS:GDUP:3AQ3:DN4O:P3JB:RIXZ:7MLY:HJFB:JDVL:GITS:TQDZ|10.20.3.12:2375 + └ Status: Healthy + └ Containers: 2 (2 Running, 0 Paused, 0 Stopped) + └ Reserved CPUs: 0 / 2 + └ Reserved Memory: 0 B / 1.01 GiB + └ Labels: kernelversion=4.15.0-48-generic, operatingsystem=Ubuntu 18.04.2 LTS, ostype=linux, storagedriver=overlay2 + └ UpdatedAt: 2019-05-12T17:37:44Z + └ ServerVersion: 18.09.6 + Plugins: + Volume: + Network: + Log: + Swarm: + NodeID: + Is Manager: false + Node Address: + Kernel Version: 4.15.0-48-generic + Operating System: linux + Architecture: amd64 + CPUs: 4 + Total Memory: 2.021GiB + Name: 008d3394a360 + Docker Root Dir: + Debug Mode (client): false + Debug Mode (server): false + Experimental: false + Live Restore Enabled: false + ## Growing the cluster From 81d545608de5cc7210e66f2161c8bc2d221549ed Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 20:47:58 +0300 Subject: [PATCH 23/32] Update README.md --- README.md | 86 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 67 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 9e2bec6..94d8fba 100644 --- a/README.md +++ b/README.md @@ -90,28 +90,76 @@ virtual machines. INSTANCES=4 vagrant up --provider virtualbox This will give us a total of 4 virtual machines, 2 new ones and the 2 -existing machines we already launched. Once the machines have launched -you should be able to run the above commands again, this time you'll get +existing machines we already launched. Once the machines have launched, +you should be able to run the above commands again - this time you'll get something like: - Containers: 6 + Containers: 9 + Running: 9 + Paused: 0 + Stopped: 0 + Images: 8 + Server Version: swarm/1.2.9 + Role: primary + Strategy: spread + Filters: health, port, containerslots, dependency, affinity, constraint, whitelist Nodes: 4 - swarm-1: 10.20.3.11:2375 - └ Containers: 3 - └ Reserved CPUs: 0 / 1 - └ Reserved Memory: 0 B / 490 MiB - swarm-2: 10.20.3.12:2375 - └ Containers: 1 - └ Reserved CPUs: 0 / 1 - └ Reserved Memory: 0 B / 490 MiB - swarm-3: 10.20.3.13:2375 - └ Containers: 1 - └ Reserved CPUs: 0 / 1 - └ Reserved Memory: 0 B / 490 MiB - swarm-4: 10.20.3.14:2375 - └ Containers: 1 - └ Reserved CPUs: 0 / 1 - └ Reserved Memory: 0 B / 490 MiB + swarm-1: 10.20.3.11:2375 + └ ID: LBE4:VBSS:MLT3:S2BG:P7BP:H2I3:E2NM:DTNR:Z3V5:VZG7:H6G2:KFIW|10.20.3.11:2375 + └ Status: Healthy + └ Containers: 3 (3 Running, 0 Paused, 0 Stopped) + └ Reserved CPUs: 0 / 2 + └ Reserved Memory: 0 B / 1.01 GiB + └ Labels: kernelversion=4.15.0-48-generic, operatingsystem=Ubuntu 18.04.2 LTS, ostype=linux, storagedriver=overlay2 + └ UpdatedAt: 2019-05-12T17:46:50Z + └ ServerVersion: 18.09.6 + swarm-2: 10.20.3.12:2375 + └ ID: RVWC:SZWS:GDUP:3AQ3:DN4O:P3JB:RIXZ:7MLY:HJFB:JDVL:GITS:TQDZ|10.20.3.12:2375 + └ Status: Healthy + └ Containers: 2 (2 Running, 0 Paused, 0 Stopped) + └ Reserved CPUs: 0 / 2 + └ Reserved Memory: 0 B / 1.01 GiB + └ Labels: kernelversion=4.15.0-48-generic, operatingsystem=Ubuntu 18.04.2 LTS, ostype=linux, storagedriver=overlay2 + └ UpdatedAt: 2019-05-12T17:46:40Z + └ ServerVersion: 18.09.6 + swarm-3: 10.20.3.13:2375 + └ ID: JHQY:UWZB:4GDJ:7D46:W7AK:FIDO:O6YD:2W77:JYZF:NH5T:DNUV:BPNH|10.20.3.13:2375 + └ Status: Healthy + └ Containers: 2 (2 Running, 0 Paused, 0 Stopped) + └ Reserved CPUs: 0 / 2 + └ Reserved Memory: 0 B / 1.01 GiB + └ Labels: kernelversion=4.15.0-48-generic, operatingsystem=Ubuntu 18.04.2 LTS, ostype=linux, storagedriver=overlay2 + └ UpdatedAt: 2019-05-12T17:46:34Z + └ ServerVersion: 18.09.6 + swarm-4: 10.20.3.14:2375 + └ ID: 5GG4:FSNF:LLHZ:KMWI:5YDX:FG3F:4WHR:KJ7X:SILJ:3VRT:DG3K:RK2L|10.20.3.14:2375 + └ Status: Healthy + └ Containers: 2 (2 Running, 0 Paused, 0 Stopped) + └ Reserved CPUs: 0 / 2 + └ Reserved Memory: 0 B / 1.01 GiB + └ Labels: kernelversion=4.15.0-48-generic, operatingsystem=Ubuntu 18.04.2 LTS, ostype=linux, storagedriver=overlay2 + └ UpdatedAt: 2019-05-12T17:47:15Z + └ ServerVersion: 18.09.6 + Plugins: + Volume: + Network: + Log: + Swarm: + NodeID: + Is Manager: false + Node Address: + Kernel Version: 4.15.0-48-generic + Operating System: linux + Architecture: amd64 + CPUs: 8 + Total Memory: 4.041GiB + Name: 008d3394a360 + Docker Root Dir: + Debug Mode (client): false + Debug Mode (server): false + Experimental: false + Live Restore Enabled: false + ## The Tour From dcf4ecc67eaf1f3ab35a07966032de9f6c9112e7 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 21:45:47 +0300 Subject: [PATCH 24/32] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 94d8fba..b8144e2 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,6 @@ Quick recap on Consul API - create two new services: # docker run -d -p 8080:8080 --name="hello" mrbarker/python-flask-hello # docker run -d -p 8081:8080 -p 8443:8443 --name="hello2" mrbarker/python-flask-hello - # docker logs registrator From 8680b0d2587bad1346c759a8fd434427a1f1fc85 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 21:57:36 +0300 Subject: [PATCH 25/32] Improve Comments. --- scripts/puppet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/puppet.sh b/scripts/puppet.sh index 4f6d02f..3be44a4 100755 --- a/scripts/puppet.sh +++ b/scripts/puppet.sh @@ -6,7 +6,7 @@ green='\e[0;32m' end='\e[0m' -# if puppet is already installed do nothing +# if puppet is already installed - do nothing if which /usr/local/bin/puppet > /dev/null 2>&1; then echo -e "${orange}----> Puppet is aready installed${end}" exit 0 From 0a5b8f77dc98fd8be9465615107b767e7161d7fc Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 22:00:33 +0300 Subject: [PATCH 26/32] Improve `.gitignore` --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eec381f..2c58ecc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,4 @@ vendor/**/ .librarian *.log *.lock -modules -vendor +modules/**/ From 3458977d1c7fef16fa1a01ab9149bec69d3ab662 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Sun, 12 May 2019 22:28:17 +0300 Subject: [PATCH 27/32] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2c58ecc..de9db2e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ .bundle vendor/**/ *.swp -.librarian *.log *.lock modules/**/ From 4cddb6046cbc4635c2f25fcab8816cbfef916a23 Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Mon, 13 May 2019 00:26:04 +0300 Subject: [PATCH 28/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8144e2..c60b715 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Using Puppet to Launch a Docker Swarm Cluster +# Using Puppet and HashiCorp Consul to Launch a Docker Swarm Cluster [Docker Swarm](https://docs.docker.com/swarm/) is part of the official Docker orchestration effort, and allows for managing containers across a From e231da72609937b1d4f9034f101f2816e5f9fece Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Mon, 13 May 2019 09:25:46 +0300 Subject: [PATCH 29/32] Hiera per Node. Improve Fmt. --- hiera.yaml | 4 +++- hieradata/{ => nodes}/swarm-1.yaml | 0 2 files changed, 3 insertions(+), 1 deletion(-) rename hieradata/{ => nodes}/swarm-1.yaml (100%) diff --git a/hiera.yaml b/hiera.yaml index 370aa33..b08440e 100644 --- a/hiera.yaml +++ b/hiera.yaml @@ -1,7 +1,9 @@ :hierarchy: - - "%{::hostname}" + - "nodes/%{::fqdn}" - common + :backends: - yaml + :yaml: :datadir: '/vagrant/hieradata' diff --git a/hieradata/swarm-1.yaml b/hieradata/nodes/swarm-1.yaml similarity index 100% rename from hieradata/swarm-1.yaml rename to hieradata/nodes/swarm-1.yaml From 3a02ce1e88595af4b932be816dfd6a9f773c37cc Mon Sep 17 00:00:00 2001 From: "Miroslav E. Hadzhiev" Date: Fri, 17 May 2019 10:11:00 +0300 Subject: [PATCH 30/32] Better Fmt. --- hiera.yaml | 3 +++ hieradata/common.yaml | 2 ++ hieradata/nodes/swarm-1.yaml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/hiera.yaml b/hiera.yaml index b08440e..8d663df 100644 --- a/hiera.yaml +++ b/hiera.yaml @@ -1,3 +1,4 @@ +--- :hierarchy: - "nodes/%{::fqdn}" - common @@ -7,3 +8,5 @@ :yaml: :datadir: '/vagrant/hieradata' + +... diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 44fc7ec..29b4d55 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -20,3 +20,5 @@ consul::config_hash: data_dir: '/opt/consul' client_addr: '0.0.0.0' bind_addr: "%{networking.interfaces.enp0s8.ip}" + +... diff --git a/hieradata/nodes/swarm-1.yaml b/hieradata/nodes/swarm-1.yaml index 31d5f20..ff4eb73 100644 --- a/hieradata/nodes/swarm-1.yaml +++ b/hieradata/nodes/swarm-1.yaml @@ -6,3 +6,5 @@ consul::config_hash: client_addr: '0.0.0.0' bind_addr: "%{networking.interfaces.enp0s8.ip}" bootstrap: true + +... From af9e659d7cd53078eaa1b962538ae424f351a081 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Sat, 26 Oct 2019 17:33:08 +0300 Subject: [PATCH 31/32] Create LICENSE --- LICENSE | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 339 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. From 8c4b61a7892ab829b7998f6c731b51a7e6270eba Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Fri, 14 Feb 2020 21:12:10 +0200 Subject: [PATCH 32/32] Update README.md --- README.md | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index c60b715..95fc611 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,12 @@ Puppet. This will launch 2 virtual machines, install Consul and register a cluster, install Docker and Swarm and then establish the swarm. -You can access the swarm using a Docker client, either from you local +You can access the swarm using a Docker client, either from your local machine or from one of the virtual machines. For instance: docker -H tcp://10.20.3.11:3000 info -If you don't have Docker installed locally you can run the above command +If you don't have Docker installed locally, you can run the above command from one of the virtual machines using: vagrant ssh swarm-1 -c "docker -H tcp://localhost:3000 info" @@ -62,26 +62,25 @@ This should print something like: └ UpdatedAt: 2019-05-12T17:37:44Z └ ServerVersion: 18.09.6 Plugins: - Volume: - Network: - Log: - Swarm: - NodeID: + Volume: + Network: + Log: + Swarm: + NodeID: Is Manager: false - Node Address: + Node Address: Kernel Version: 4.15.0-48-generic Operating System: linux Architecture: amd64 CPUs: 4 Total Memory: 2.021GiB Name: 008d3394a360 - Docker Root Dir: + Docker Root Dir: Debug Mode (client): false Debug Mode (server): false Experimental: false Live Restore Enabled: false - ## Growing the cluster We can also automatically scale the cluster by launching additional @@ -141,27 +140,25 @@ something like: └ UpdatedAt: 2019-05-12T17:47:15Z └ ServerVersion: 18.09.6 Plugins: - Volume: - Network: - Log: - Swarm: - NodeID: + Volume: + Network: + Log: + Swarm: + NodeID: Is Manager: false - Node Address: + Node Address: Kernel Version: 4.15.0-48-generic Operating System: linux Architecture: amd64 CPUs: 8 Total Memory: 4.041GiB Name: 008d3394a360 - Docker Root Dir: + Docker Root Dir: Debug Mode (client): false Debug Mode (server): false Experimental: false Live Restore Enabled: false - - ## The Tour Quick recap on Consul API - create two new services: @@ -195,10 +192,9 @@ Reverse DNS - (XXX double check long vs. short name returned): # dig -x 10.20.3.11 +short swarm-1. - ## Implementation details -The example uses the Docker module to launch the Swarm containers. +The example uses the Docker module to launch the Swarm containers. First, we run the main Swarm container on all hosts: @@ -221,7 +217,7 @@ Then, on one host we run the Swarm Manager: ``` Consul is managed by the excellent [Consul module](https://github.com/solarkennedy) from [Kyle -Anderson](https://github.com/solarkennedy). Much of the Consul configuration is in the hiera data, for example: +Anderson](https://github.com/solarkennedy). Much of the Consul configuration is in the Hiera data, for example: ```yaml consul::config_hash: