I am not sure why me and mcornea are not hitting this in our downstream envs. For my latest run yesterday I was patching like [0] which includes the nova patch at https://review.openstack.org/#/c/405241/ so it was definitely applied (it would have nuked the file on my run too wrt alex question in comment #2 above or its some kind of race :/ ??)

I have reset to latest puddle today so will be running it again assuming other things don't break before then ;)


[0]
    # NOTE: these patches were applied to openstack-tripleo-heat-templates-6.0.0-0.20170214010958.el7ost.noarch
    #backup templates incase you want to do a diff/sanitycheck:
    sudo cp -r /usr/share/openstack-tripleo-heat-templates /usr/share/openstack-tripleo-heat-templates.ORIG

    # https://review.openstack.org/#/c/431398/1 Apply post-upgrade step to not run puppet in post upgrade
    curl https://review.openstack.org/changes/431398/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1

    # https://review.openstack.org/#/c/433641/ Apply puppet in non-controller script in step.
    curl https://review.openstack.org/changes/433641/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1

    # https://review.openstack.org/#/c/434305/ Add explicit swift check to tripleo_upgrade_node.sh
    curl https://review.openstack.org/changes/434305/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1

    # https://review.openstack.org/#/c/434367/ Add manual ceph-osd upgrade if operator prefers this 
    curl https://review.openstack.org/changes/434367/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1

    # https://review.openstack.org/#/c/435339 Install nova-placement package on upgrade
    curl https://review.openstack.org/changes/435339/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1

    # Add major-upgrade-converge environment. https://review.openstack.org/#/c/434468/
    curl https://review.openstack.org/changes/434468/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1

    # https://review.openstack.org/#/c/405241/ Add nova service support for composable upgrades 
    curl https://review.openstack.org/changes/405241/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1

    # Add Newton to Ocata UpgradeInitCommonCommand https://review.openstack.org/#/c/424715/
    curl https://review.openstack.org/changes/424715/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1

    # https://review.openstack.org/#/c/436150/ Stop nova-api before upgrading package
    curl https://review.openstack.org/changes/436150/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1

    # https://review.openstack.org/#/c/436472/ Add step0,validation checks for heat services  
    curl https://review.openstack.org/changes/436472/revisions/current/patch?download | \
        base64 -d | sudo patch  -d /usr/share/openstack-tripleo-heat-templates/ -p1