starlingx/docs
Code Issues Proposed changes
Files
5e8ef28507c4df013d5a80df27d154c67fb954a4
docs/doc/source/_includes
History
Ron Stone 5e8ef28507 Resolve merge conflicts. 
This review is for merge conflicts between abandoned
https://review.opendev.org/c/starlingx/docs/+/797943
and
https://review.opendev.org/c/starlingx/docs/+/797948
and replaces those updates.

Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: Ibb386daeb633606a50b1444d95cdc95dea21959b
2021-06-28 15:52:32 -04:00
..
about-host-memory-provisioning.rest
Node Mgmt _include fixes
2021-06-24 15:14:06 +00:00
adding-compute-nodes-to-an-existing-duplex-system.rest
Upstreaming WRO
2021-03-31 08:57:23 -04:00
allocating-host-memory-using-horizon.rest
Node Mgmt _include fixes
2021-06-24 15:14:06 +00:00
allocating-host-memory-using-the-cli.rest
Node Mgmt _include fixes
2021-06-24 15:14:06 +00:00
avs-note.rest
Node Mgmt _include fixes
2021-06-24 15:14:06 +00:00
bootstrapping-and-deploying-starlingx.rest
More install doc changes; data and sriov interfaces.
2021-05-19 11:24:48 -04:00
common-openstack-labels.rest
Node Management doc
2020-12-24 11:37:50 -05:00
configure-cpu-core-vswitch.rest
Update upstream node management
2021-03-10 14:05:00 -03:00
configure-external-netapp.rest
Storage Update
2021-03-23 09:20:34 -03:00
configuring-aggregated-ethernet-interfaces-using-horizon.rest
Node Management doc
2020-12-24 11:37:50 -05:00
configuring-aggregated-ethernet-interfaces-using-the-cli.rest
Node Management doc
2020-12-24 11:37:50 -05:00
configuring-kubernetes-update-orchestration-on-distributed-cloud.rest
Kubernetes upgrade orchestration on DC
2021-06-07 11:14:29 -04:00
configuring-kubernetes-update-orchestration.rest
Platform k8s upgrades
2021-05-14 19:35:43 +00:00
configuring-pci-passthrough-ethernet-interfaces.rest
Upstreaming WRO
2021-03-31 08:57:23 -04:00
data-networks-overview.rest
Data Networks guide
2020-11-23 09:17:34 -05:00
distributed-upgrade-orchestration-process-using-the-cli.rest
Resolve merge conflicts.
2021-06-28 15:52:32 -04:00
dm-doc-ref.rest
Add Distributed guide
2021-04-21 20:42:23 +00:00
dynamic-vxlan.rest
Datanet reorg
2021-04-05 11:39:14 -04:00
ethernet-interface-configuration.rest
Openstack planning
2021-01-25 08:36:47 -05:00
failure-during-the-installation-or-data-migration-of-n+1-load-on-a-subcloud.rest
DC Orchestration for AIO-DX & Standard Subclouds
2021-05-18 11:15:04 +00:00
handling-kubernetes-update-orchestration-failures.rest
Platform k8s upgrades
2021-05-14 19:35:43 +00:00
install-kubernetes-bootstrap-playbook.rest
More install doc changes; data and sriov interfaces.
2021-05-19 11:24:48 -04:00
install-kubernetes-null-labels.rest
Fix link resolution
2021-06-22 19:15:27 +00:00
install-playbook-values-aws.rest
Install conditionalization
2021-05-03 15:17:55 +00:00
installation-and-resource-planning-verified-commercial-hardware.rest
CephFS RWX Support in Host-based Ceph
2021-05-13 12:29:29 -04:00
installing-a-subcloud-using-redfish-platform-management-service.rest
Rehoming a Subcloud
2021-06-28 08:52:32 -04:00
installing-a-subcloud-without-redfish-platform-management-service.rest
Rehoming a Subcloud
2021-06-28 08:52:32 -04:00
installing-and-provisioning-a-subcloud.rest
CephFS RWX Support in Host-based Ceph
2021-05-13 12:29:29 -04:00
installing-and-provisioning-the-central-cloud.rest
CephFS RWX Support in Host-based Ceph
2021-05-13 12:29:29 -04:00
installing-software-updates-before-initial-commissioning.rest
Add updates and upgrades content
2021-06-23 15:25:41 +00:00
integrate-application-with-notification-client-sidecar.rest
Inclusive Language Updates
2021-06-28 08:27:08 -04:00
isolating-cpu-cores-to-enhance-application-performance.rest
Removed CMK
2021-06-23 20:09:05 +00:00
kubernetes-cpu-manager-policies.rest
Removed CMK
2021-06-23 20:09:05 +00:00
kubernetes-user-tutorials-configuring-container-backed-remote-clis-and-clients.rest
Change User Tasks
2021-03-26 13:30:27 -03:00
manage-keystone-accounts.rest
Editorial updates on Security Guide upstream
2021-06-24 14:19:52 +00:00
migrate-an-aiosx-subcloud-to-an-aiodx-subcloud.rest
Remote Redfish Subcloud Restore
2021-06-25 07:21:46 -04:00
nodeport-usage-restrictions.rest
User Tasks guide
2020-12-02 10:34:53 -05:00
openstack-alarm-messages-xxxs.rest
Fault Management guide
2020-11-09 13:58:05 -05:00
openstack-customer-log-messages-xxxs
Fault Management guide
2020-11-09 13:58:05 -05:00
openstack-customer-log-messages-xxxs.rest
Fault Management guide
2020-11-09 13:58:05 -05:00
openstack-fault-management-overview.rest
Fault Management doc
2020-11-27 14:13:00 -05:00
os-data-networks-overview.rest
Openstack planning
2021-01-25 08:36:47 -05:00
overview-of-vnf-integration.rest
Removed proprietary (AVS and AVP) content from VNF section
2021-05-04 19:28:20 +00:00
pci-passthrough-ethernet-interface-devices.rest
Upstreaming WRO
2021-03-31 08:57:23 -04:00
performing-an-orchestrated-upgrade-using-the-cli.rest
Resolve merge conflicts.
2021-06-28 15:52:32 -04:00
performing-an-orchestrated-upgrade.rest
Resolve merge conflicts.
2021-06-28 15:52:32 -04:00
performing-an-orchestred-kubernetes-upgrade-for-distributed-cloud.rest
Kubernetes upgrade orchestration on DC
2021-06-07 11:14:29 -04:00
port-security-extension.rest
Openstack planning
2021-01-25 08:36:47 -05:00
project-network-planning.rest
Openstack planning
2021-01-25 08:36:47 -05:00
project-networks.rest
Openstack planning
2021-01-25 08:36:47 -05:00
provisioning-sr-iov-vf-interfaces-using-the-cli.rest
Upstreaming WRO
2021-03-31 08:57:23 -04:00
rehoming-a-subcloud.rest
Rehoming a Subcloud
2021-06-28 08:52:32 -04:00
release-notes-overview-footnote.rest
Update planning
2021-03-23 09:56:17 -03:00
resource-planning.rest
Upstreaming WRO
2021-03-31 08:57:23 -04:00
restore-openstack-from-a-backup.rest
Upstreaming WRO
2021-03-31 08:57:23 -04:00
standard-virtio-backed-with-vhost-support.rest
Removed proprietary (AVS and AVP) content from VNF section
2021-05-04 19:28:20 +00:00
static-vxlan.rest
Upstreaming WRO
2021-03-31 08:57:23 -04:00
subnet-sizing-restrictions.rest
Update planning
2021-03-23 09:56:17 -03:00
the-ethernet-mtu.rest
Openstack planning
2021-01-25 08:36:47 -05:00
troubleshooting-log-collection.rest
Fault Management guide
2020-11-09 13:58:05 -05:00
upgrade-management-overview.rest
DC Orchestration for AIO-DX & Standard Subclouds
2021-05-18 11:15:04 +00:00
upgrading-all-in-one-duplex-or-standard.rest
Resolve merge conflicts.
2021-06-28 15:52:32 -04:00
upgrading-all-in-one-simplex.rest
Resolve merge conflicts.
2021-06-28 15:52:32 -04:00
upgrading-the-systemcontroller-using-the-cli.rest
Resolve merge conflicts.
2021-06-28 15:52:32 -04:00
use-a-vif-model-when-creating-ports.rest
Removed proprietary (AVS and AVP) content from VNF section
2021-05-04 19:28:20 +00:00
using-labels-to-identify-openstack-nodes.rest
Upstreaming WRO
2021-03-31 08:57:23 -04:00
using-network-attachment-definitions-in-a-container.rest
SRIOV pods not in running state after SX upgrade
2021-06-23 19:41:20 +00:00
verified-commercial-hardware.rest
Planning guide
2020-12-31 14:28:49 -05:00
vm-network-interface-options.rest
Openstack planning
2021-01-25 08:36:47 -05:00
vxlan-data-networks.rest
Upstreaming WRO
2021-03-31 08:57:23 -04:00
x00-series-alarm-messages.rest
Fault Management guide
2020-11-09 13:58:05 -05:00