-
Notifications
You must be signed in to change notification settings - Fork 170
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.
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
Multus for vsphere #10906
Merged
Merged
Multus for vsphere #10906
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
24 changes: 24 additions & 0 deletions
24
conf/deployment/vsphere/upi_1az_rhcos_multus_public_cluster_vsan_3m_3w.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
--- | ||
# This config is suppose to work on most of DCs we have. | ||
DEPLOYMENT: | ||
allow_lower_instance_requirements: false | ||
ENV_DATA: | ||
platform: "vsphere" | ||
deployment_type: "upi" | ||
worker_replicas: 3 | ||
master_replicas: 3 | ||
worker_num_cpus: "16" | ||
master_num_cpus: "4" | ||
master_memory: "16384" | ||
compute_memory: "65536" | ||
fio_storageutilization_min_mbps: 10.0 | ||
is_multus_enabled: true | ||
multus_public_net_interface: "ens224" | ||
multus_cluster_net_interface: "ens224" | ||
multus_create_public_net: true | ||
multus_create_cluster_net: true | ||
multus_public_net_namespace: "default" | ||
|
||
REPORTING: | ||
polarion: | ||
deployment_id: "OCS-6302" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 27 additions & 25 deletions
52
ocs_ci/templates/ocs-deployment/node_network_configuration_policy.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,31 @@ | ||
apiVersion: nmstate.io/v1 | ||
kind: NodeNetworkConfigurationPolicy | ||
metadata: | ||
name: ceph-public-net-shim-worker-node | ||
namespace: openshift-storage | ||
name: ceph-public-net-shim-worker-node | ||
namespace: openshift-storage | ||
spec: | ||
nodeSelector: | ||
node-role.kubernetes.io/worker: "" | ||
kubernetes.io/hostname: worker-node | ||
desiredState: | ||
interfaces: | ||
- name: odf-pub-shim | ||
description: Shim interface used to connect host to OpenShift Data Foundation public Multus network | ||
type: mac-vlan | ||
state: up | ||
mac-vlan: | ||
base-iface: enp1s0f1 | ||
mode: bridge | ||
promiscuous: true | ||
ipv4: | ||
enabled: true | ||
dhcp: false | ||
address: | ||
- ip: 192.168.252.1 # STATIC IP FOR worker node | ||
prefix-length: 24 | ||
routes: | ||
config: | ||
- destination: 192.168.20.0/24 | ||
next-hop-interface: odf-pub-shim | ||
nodeSelector: | ||
node-role.kubernetes.io/worker: "" | ||
kubernetes.io/hostname: worker-node | ||
desiredState: | ||
interfaces: | ||
- name: odf-pub-shim | ||
description: Shim interface used to connect host to OpenShift Data Foundation public Multus network | ||
type: mac-vlan | ||
state: up | ||
mac-vlan: | ||
base-iface: enp1s0f1 | ||
mode: bridge | ||
promiscuous: true | ||
ipv4: | ||
enabled: true | ||
dhcp: false | ||
address: | ||
- ip: 192.168.252.1 # STATIC IP FOR worker node | ||
prefix-length: 24 | ||
routes: | ||
config: | ||
- destination: 192.168.20.0/24 | ||
next-hop-interface: odf-pub-shim | ||
- destination: 192.168.30.0/24 | ||
next-hop-interface: odf-pub-shim |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please delete the space.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it somehow messed here in how github present it. This is how it looks in the editor:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The indentation of the file was just one space and the editor fixed it to have 2 spaces which is our regular formatting of yaml