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
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,11 @@ kind: OpenStackDataPlaneNodeSet
metadata:
name: openstack-$CELL
spec:
tlsEnabled: false
tlsEnabled: false
networkAttachments:
- ctlplane
preProvisioned: true
services:
services:
ifeval::["{build}" == "downstream"]
- redhat
endif::[]
Expand All @@ -432,7 +432,7 @@ endif::[]
- name: ANSIBLE_FORCE_COLOR
value: "True"
- name: ANSIBLE_VERBOSITY
value: '3'
value: "3"
nodeTemplate:
ansibleSSHPrivateKeySecret: dataplane-adoption-secret
ansible:
Expand Down Expand Up @@ -502,15 +502,15 @@ endif::[]
#
# These vars are for the network config templates themselves and are
# considered EDPM network defaults.
neutron_physical_bridge_name: br-ctlplane
neutron_physical_bridge_name: br-ctlplane
neutron_public_interface_name: eth0

# edpm_nodes_validation
edpm_nodes_validation_validate_controllers_icmp: false
edpm_nodes_validation_validate_gateway_icmp: false

# edpm ovn-controller configuration
edpm_ovn_bridge_mappings: <bridge_mappings>
edpm_ovn_bridge_mappings: <bridge_mappings>
edpm_ovn_bridge: br-int
edpm_ovn_encap_type: geneve
ovn_monitor_all: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ To adopt a {OpenStackPreviousInstaller}-deployed {block_storage_first_ref}, crea
* The contents of `cinder.conf` file. Download the file so that you can access it locally:
+
----
$CONTROLLER1_SSH cat /var/lib/config-data/puppet-generated/cinder/etc/cinder/cinder.conf > cinder.conf
$CONTROLLER1_SSH sudo cat /var/lib/config-data/puppet-generated/cinder/etc/cinder/cinder.conf > cinder.conf
----

.Procedure
Expand Down
4 changes: 0 additions & 4 deletions docs_user/modules/proc_deploying-backend-services.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,6 @@ spec:
template:
ovnController:
networkAttachment: tenant
nodeSelector:
node: non-existing-node-name
ovnNorthd:
replicas: 0
ovnDBCluster:
Expand Down Expand Up @@ -488,8 +486,6 @@ spec:
template:
ovnController:
networkAttachment: tenant
nodeSelector:
node: non-existing-node-name
ovnNorthd:
replicas: 0
ovnDBCluster:
Expand Down
1 change: 1 addition & 0 deletions docs_user/modules/proc_migrating-ovn-data.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ spec:
ovnController:
nicMappings:
physNet: NIC
'
----
+
* `physNet` defines the name of your physical network. `NIC` is the name of the physical interface that is connected to your physical network.
Expand Down
Loading