Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
d4467ab1
Commit
d4467ab1
authored
8 years ago
by
Pablo Moreno
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #3 from kubernetes-incubator/master
stays up to date with upstream
parents
36fc05d2
ebeb57ee
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Vagrantfile
+14
-1
14 additions, 1 deletion
Vagrantfile
roles/docker/handlers/main.yml
+7
-0
7 additions, 0 deletions
roles/docker/handlers/main.yml
with
21 additions
and
1 deletion
Vagrantfile
+
14
−
1
View file @
d4467ab1
...
...
@@ -16,7 +16,7 @@ $vm_cpus = 1
$shared_folders
=
{}
$forwarded_ports
=
{}
$subnet
=
"172.17.8"
$box
=
"bento/ubuntu-1
4
.04"
$box
=
"bento/ubuntu-1
6
.04"
host_vars
=
{}
...
...
@@ -38,6 +38,13 @@ if ! File.exist?(File.join(File.dirname($inventory), "hosts"))
end
end
if
Vagrant
.
has_plugin?
(
"vagrant-proxyconf"
)
$no_proxy
=
ENV
[
'NO_PROXY'
]
||
ENV
[
'no_proxy'
]
||
"127.0.0.1,localhost"
(
1
..
$num_instances
).
each
do
|
i
|
$no_proxy
+=
",
#{
$subnet
}
.
#{
i
+
100
}
"
end
end
Vagrant
.
configure
(
"2"
)
do
|
config
|
# always use Vagrants insecure key
config
.
ssh
.
insert_key
=
false
...
...
@@ -52,6 +59,12 @@ Vagrant.configure("2") do |config|
config
.
vm
.
define
vm_name
=
"%s-%02d"
%
[
$instance_name_prefix
,
i
]
do
|
config
|
config
.
vm
.
hostname
=
vm_name
if
Vagrant
.
has_plugin?
(
"vagrant-proxyconf"
)
config
.
proxy
.
http
=
ENV
[
'HTTP_PROXY'
]
||
ENV
[
'http_proxy'
]
||
""
config
.
proxy
.
https
=
ENV
[
'HTTPS_PROXY'
]
||
ENV
[
'https_proxy'
]
||
""
config
.
proxy
.
no_proxy
=
$no_proxy
end
if
$expose_docker_tcp
config
.
vm
.
network
"forwarded_port"
,
guest:
2375
,
host:
(
$expose_docker_tcp
+
i
-
1
),
auto_correct:
true
end
...
...
This diff is collapsed.
Click to expand it.
roles/docker/handlers/main.yml
+
7
−
0
View file @
d4467ab1
...
...
@@ -3,6 +3,7 @@
command
:
/bin/true
notify
:
-
Docker | reload systemd
-
Docker | reload docker.socket
-
Docker | reload docker
-
Docker | pause while Docker restarts
-
Docker | wait for docker
...
...
@@ -16,6 +17,12 @@
name
:
docker
state
:
restarted
-
name
:
Docker | reload docker.socket
service
:
name
:
docker.socket
state
:
restarted
when
:
ansible_os_family == 'CoreOS'
-
name
:
Docker | pause while Docker restarts
pause
:
seconds=10 prompt="Waiting for docker restart"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment