diff --git a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc index 268a9adfb..40b6aeba6 100644 --- a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc +++ b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc @@ -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::[] @@ -432,7 +432,7 @@ endif::[] - name: ANSIBLE_FORCE_COLOR value: "True" - name: ANSIBLE_VERBOSITY - value: '3' + value: "3" nodeTemplate: ansibleSSHPrivateKeySecret: dataplane-adoption-secret ansible: @@ -502,7 +502,7 @@ 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 @@ -510,7 +510,7 @@ endif::[] edpm_nodes_validation_validate_gateway_icmp: false # edpm ovn-controller configuration - edpm_ovn_bridge_mappings: + edpm_ovn_bridge_mappings: edpm_ovn_bridge: br-int edpm_ovn_encap_type: geneve ovn_monitor_all: true diff --git a/docs_user/modules/proc_adopting-the-block-storage-service.adoc b/docs_user/modules/proc_adopting-the-block-storage-service.adoc index 6aebe5b06..5e1ef889a 100644 --- a/docs_user/modules/proc_adopting-the-block-storage-service.adoc +++ b/docs_user/modules/proc_adopting-the-block-storage-service.adoc @@ -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 diff --git a/docs_user/modules/proc_deploying-backend-services.adoc b/docs_user/modules/proc_deploying-backend-services.adoc index df66f147f..a1b97daf0 100644 --- a/docs_user/modules/proc_deploying-backend-services.adoc +++ b/docs_user/modules/proc_deploying-backend-services.adoc @@ -246,8 +246,6 @@ spec: template: ovnController: networkAttachment: tenant - nodeSelector: - node: non-existing-node-name ovnNorthd: replicas: 0 ovnDBCluster: @@ -488,8 +486,6 @@ spec: template: ovnController: networkAttachment: tenant - nodeSelector: - node: non-existing-node-name ovnNorthd: replicas: 0 ovnDBCluster: diff --git a/docs_user/modules/proc_migrating-ovn-data.adoc b/docs_user/modules/proc_migrating-ovn-data.adoc index 261f8b85a..cbcc6d48e 100644 --- a/docs_user/modules/proc_migrating-ovn-data.adoc +++ b/docs_user/modules/proc_migrating-ovn-data.adoc @@ -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.