Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: typo #1173

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: typo #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions install/k8s/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Install kubernetes 1.6 or higher using http://kubernetes.io/docs/getting-started
* For ACI setups use contiv/contiv_aci.yaml instead of contiv/contiv.yaml.
* Replace all instances of `__NETMASTER_IP__` in contiv/contiv.yaml with the master IP.
* Replace `__VLAN_IF__` with the data plane interface.
If there is no requirement to create vlan based networks there is no need for a seperate data interface and `__VLAN_IF__` can be set to "". If vlan based networks are to be created then a separate data interface is mandatory which can be set appropriately.
If there is no requirement to create vlan based networks there is no need for a separate data interface and `__VLAN_IF__` can be set to "". If vlan based networks are to be created then a separate data interface is mandatory which can be set appropriately.
* Optional: Replace the contiv version(1.1.7) with the desired release/test version.
* Optional ACI only steps:
- Replace __APIC_xxx__ fields with their corresponding values.
Expand Down Expand Up @@ -42,7 +42,7 @@ netctl global set --fabric-mode aci --vlan-range 1150-1170

### Using Contiv

* On the managment node, create the default network and EPG. For example, a vxlan network can be created as follows:
* On the management node, create the default network and EPG. For example, a vxlan network can be created as follows:
```sh
netctl net create -t default --subnet=20.1.1.0/24 default-net
netctl group create -t default default-net default-epg
Expand Down
2 changes: 1 addition & 1 deletion install/v2plugin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ CONTIV_NETMASTER_USE_SYSLOG : netmaster send log to syslog if flag is prov
CONTIV_NETMASTER_USE_JSON_LOG : netmaster log format to json if flag is provided : <not-use-json-format>
```
### docker store
Docker certified contiv plugin is avaliable on [Docker Store](https://store.docker.com/plugins/803eecee-0780-401a-a454-e9523ccf86b3?tab=description).
Docker certified contiv plugin is available on [Docker Store](https://store.docker.com/plugins/803eecee-0780-401a-a454-e9523ccf86b3?tab=description).
```
docker plugin install store/contiv/v2plugin:<version-tag> \
CONTIV_ROLE=netmaster CONTIV_NETPLUGIN_VLAN_UPLINKS=<VLAN-uplinks> \
Expand Down