Bug 1378177 - Documentation: using diff -Nary produces too much output, would suggest to use diff -Nar
Summary: Documentation: using diff -Nary produces too much output, would suggest to us...
Keywords:
Status: CLOSED CURRENTRELEASE
Alias: None
Product: Red Hat OpenStack
Classification: Red Hat
Component: documentation
Version: 9.0 (Mitaka)
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: async
: 10.0 (Newton)
Assignee: Charelle Collett
QA Contact: Martin Lopes
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2016-09-21 17:44 UTC by Alexander Chuzhoy
Modified: 2017-05-04 02:50 UTC (History)
3 users (show)

Fixed In Version:
Doc Type: If docs needed, set a value
Doc Text:
Clone Of:
Environment:
Last Closed: 2017-05-04 02:50:08 UTC
Target Upstream Version:


Attachments (Terms of Use)

Description Alexander Chuzhoy 2016-09-21 17:44:32 UTC
Looking at the last example in section 3.2 here:
https://access.redhat.com/documentation/en/red-hat-openstack-platform/9/paged/upgrading-red-hat-openstack-platform/chapter-3-director-based-environments-performing-upgrades-to-major-versions

I see: "diff -Nary /usr/share/openstack-tripleo-heat-templates/ ~/templates/my-overcloud/"

Trying that (limiting to 10 lines output) - it produces too much output.

[stack@undercloud ~]$ diff -Nary /usr/share/openstack-tripleo-heat-templates/ ~/pilot/templates/overcloud |head
diff -Nary /usr/share/openstack-tripleo-heat-templates/all-nodes-validation.yaml /home/stack/pilot/templates/overcloud/all-nodes-validation.yaml
heat_template_version: 2015-04-30                               heat_template_version: 2015-04-30

description: >                                                  description: >
  Software Config to drive validations that occur on all node     Software Config to drive validations that occur on all node
  Note, you need the heat-config-script element built into yo     Note, you need the heat-config-script element built into yo
  images, due to the script group below.                          images, due to the script group below.

parameters:                                                     parameters:
  PingTestIps:                                                    PingTestIps:



I'd suggest to use diff -Nar /usr/share/openstack-tripleo-heat-templates/ ~/templates/my-overcloud/

Here's an example:
[stack@undercloud ~]$ diff -Nar /usr/share/openstack-tripleo-heat-templates/ ~/pilot/templates/overcloud |head
diff -Nar /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml /home/stack/pilot/templates/overcloud/environments/storage-environment.yaml
5d4
<   OS::TripleO::NodeUserData: /home/stack/wipe-disk.yaml



Just the relevant output.

Comment 2 Lucy Bopf 2017-02-21 01:05:35 UTC
Assigning to Charelle for review.


Note You need to log in before you can comment on or make changes to this bug.