Skip to content

Conversation

@sdodson
Copy link
Member

@sdodson sdodson commented Aug 21, 2018

This file is wholely managed by openshift-ansible. However if we remove
the file from the RPM entirely then that will delete the file during
upgrades to the newer version. So leave the file in the package with
empty contents. The %config(noreplace) directive will ensure that RPM
doesn't replace local modifications when upgrading.

/cc @sjenning @vrutkovs @smarterclayton
Supersedes #20683

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 21, 2018
@sdodson sdodson force-pushed the restore-sysconfig-file branch from b7b2d38 to 26439bc Compare August 21, 2018 17:17
@sdodson sdodson changed the title Re-add systeconfig file Re-add sysconfig/origin-node Aug 21, 2018
@sdodson sdodson force-pushed the restore-sysconfig-file branch from 26439bc to c5db4a5 Compare August 22, 2018 13:36
@sdodson sdodson changed the title Re-add sysconfig/origin-node Preserve sysconfig/origin-node Aug 22, 2018
@sdodson sdodson force-pushed the restore-sysconfig-file branch from c5db4a5 to f5c0d60 Compare August 22, 2018 14:43
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 22, 2018
@sdodson sdodson force-pushed the restore-sysconfig-file branch from f5c0d60 to f1fe533 Compare August 22, 2018 14:44
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 22, 2018
@sdodson sdodson changed the title Preserve sysconfig/origin-node RPMS - Add stub /etc/sysconfig/origin-node Aug 22, 2018
Previously we'd removed this file from the RPM, however that resulted in
the file being removed during upgrades which altered configuration on
running systems
@sdodson sdodson force-pushed the restore-sysconfig-file branch from f1fe533 to f4ea5eb Compare August 22, 2018 14:54
@smarterclayton
Copy link
Contributor

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 22, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sdodson, smarterclayton

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 22, 2018
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants