Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,3 +184,4 @@
1 Geoff Meakin
1 Joshua Spence
1 Justin Riley
1 Schusler, Olaf
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -759,21 +759,21 @@ To configure the swarm worker, add the following code to the manifest file:

```puppet
docker::swarm {'cluster_worker':
join => true,
advertise_addr => '192.168.1.2',
listen_addr => '192.168.1.2',
manager_ip => '192.168.1.1',
token => 'your_join_token'
join => true,
advertise_addr => '192.168.1.2',
listen_addr => '192.168.1.2',
manager_ip => '192.168.1.1',
token => 'your_join_token'
}
```

To configure a worker node or a second manager, include the swarm manager IP address in the `manager_ip` parameter. To define the role of the node in the cluster, include the `token` parameter. When creating an additional swarm manager and a worker node, separate tokens are required.
To configure a worker node or a second manager, include the swarm manager IP address in the `manager_ip` parameter. To define the role of the node in the cluster, include the `token` parameter. When creating an additional swarm manager and a worker node, separate tokens are required. These tokens (i.e. `docker_worker_join_token` and `docker_manager_join_token`) can be retrieved from Facter.

To remove a node from a cluster, add the following code to the manifest file:

```puppet
docker::swarm {'cluster_worker':
ensure => absent
ensure => absent
}
```

Expand Down
22 changes: 22 additions & 0 deletions lib/facter/docker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,28 @@ def interfaces
end
end

Facter.add(:docker_worker_join_token) do
setcode do
if Facter::Util::Resolution.which('docker')
val = Facter::Util::Resolution.exec(
"#{docker_command} swarm join-token worker -q",
)
end
val
end
end

Facter.add(:docker_manager_join_token) do
setcode do
if Facter::Util::Resolution.which('docker')
val = Facter::Util::Resolution.exec(
"#{docker_command} swarm join-token manager -q",
)
end
val
end
end

Facter.add(:docker) do
setcode do
docker_version = Facter.value(:docker_client_version)
Expand Down
1 change: 1 addition & 0 deletions spec/fixtures/facts/docker_swarm_manager_token
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SWMTKN-1-2m7ekt7511j5kgrc6seyrewpdxv47ksz1sdg7iybzhuug6nmws-8gh1ns1lcavgau8k9p6ou7xj3
1 change: 1 addition & 0 deletions spec/fixtures/facts/docker_swarm_worker_token
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SWMTKN-1-2m7ekt7511j5kgrc6seyrewpdxv47ksz1sdg7iybzhuug6nmws-0jh0syqeoj3tlr81p165ydfkm
26 changes: 26 additions & 0 deletions spec/unit/lib/facter/docker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
inspect = File.read(fixtures('facts', "docker_network_inspect_#{network}"))
Facter::Util::Resolution.stubs(:exec).with("#{docker_command} network inspect #{network}").returns(inspect)
end
docker_worker_token = File.read(fixtures('facts', 'docker_swarm_worker_token'))
Facter::Util::Resolution.stubs(:exec).with("#{docker_command} swarm join-token worker -q").returns(docker_worker_token.chomp)
docker_manager_token = File.read(fixtures('facts', 'docker_swarm_manager_token'))
Facter::Util::Resolution.stubs(:exec).with("#{docker_command} swarm join-token manager -q").returns(docker_manager_token.chomp)
end
after(:each) { Facter.clear }

Expand Down Expand Up @@ -94,4 +98,26 @@
)
end
end

describe 'docker swarm worker join-token' do
before :each do
Facter.fact(:interfaces).stubs(:value).returns('br-19a6ebf6f5a5,docker0,eth0,lo')
end
it do
expect(Facter.fact(:docker_worker_join_token).value).to eq(
'SWMTKN-1-2m7ekt7511j5kgrc6seyrewpdxv47ksz1sdg7iybzhuug6nmws-0jh0syqeoj3tlr81p165ydfkm',
)
end
end

describe 'docker swarm manager join-token' do
before :each do
Facter.fact(:interfaces).stubs(:value).returns('br-19a6ebf6f5a5,docker0,eth0,lo')
end
it do
expect(Facter.fact(:docker_manager_join_token).value).to eq(
'SWMTKN-1-2m7ekt7511j5kgrc6seyrewpdxv47ksz1sdg7iybzhuug6nmws-8gh1ns1lcavgau8k9p6ou7xj3',
)
end
end
end