Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a529c0e0
Commit
a529c0e0
authored
Apr 29, 2015
by
CJ Cullen
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7499 from elsonrodriguez/coreos-example-fix
Fixes #7498 - CoreOS Getting Started Guide had invalid cloud config
parents
6c220070
f5e81c25
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
master.yaml
docs/getting-started-guides/coreos/cloud-configs/master.yaml
+0
-1
node.yaml
docs/getting-started-guides/coreos/cloud-configs/node.yaml
+1
-1
No files found.
docs/getting-started-guides/coreos/cloud-configs/master.yaml
View file @
a529c0e0
...
@@ -12,7 +12,6 @@ coreos:
...
@@ -12,7 +12,6 @@ coreos:
etcd-servers
:
http://localhost:4001
etcd-servers
:
http://localhost:4001
metadata
:
"
role=master"
metadata
:
"
role=master"
flannel
:
flannel
:
interface
:
eth1
units
:
units
:
-
name
:
setup-network-environment.service
-
name
:
setup-network-environment.service
command
:
start
command
:
start
...
...
docs/getting-started-guides/coreos/cloud-configs/node.yaml
View file @
a529c0e0
...
@@ -5,7 +5,6 @@ coreos:
...
@@ -5,7 +5,6 @@ coreos:
etcd-servers
:
http://<master-private-ip>:4001
etcd-servers
:
http://<master-private-ip>:4001
metadata
:
"
role=node"
metadata
:
"
role=node"
flannel
:
flannel
:
interface
:
eth1
etcd_endpoints
:
http://<master-private-ip>:4001
etcd_endpoints
:
http://<master-private-ip>:4001
units
:
units
:
-
name
:
etcd.service
-
name
:
etcd.service
...
@@ -18,6 +17,7 @@ coreos:
...
@@ -18,6 +17,7 @@ coreos:
-
name
:
50-network-config.conf
-
name
:
50-network-config.conf
content
:
|
content
:
|
[Service]
[Service]
Environment=ETCDCTL_PEERS=http://<master-private-ip>:4001
ExecStartPre=/bin/bash -c "until curl http://<master-private-ip>:4001/v2/machines; do sleep 2; done"
ExecStartPre=/bin/bash -c "until curl http://<master-private-ip>:4001/v2/machines; do sleep 2; done"
ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
-
name
:
docker.service
-
name
:
docker.service
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment