Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #14182: Remove initial promises from rudder agent package #1791

Conversation

peckpeck
Copy link
Member

initial-ncf: ./rudder-sources ./initial-promises
rm -rf ./initial-ncf
cp -r ./rudder-sources/ncf/tree ./initial-ncf
# retreive the rudder specific ncf.conf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove this now

cp -r initial-promises/ $(DESTDIR)/opt/rudder/share/
cp -r initial-ncf/ $(DESTDIR)/opt/rudder/share/

touch $@
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing indent

@peckpeck
Copy link
Member Author

Commit modified

@amousset
Copy link
Member

@peck needs rebase

@peckpeck
Copy link
Member Author

PR rebased

@peckpeck peckpeck force-pushed the arch_14182/remove_initial_promises_from_rudder_agent_package branch from f495295 to 715f689 Compare March 22, 2019 14:42
@@ -200,19 +200,7 @@ then
RESTORE_SERVER_ROLES_BACKUP=1
fi

# Copy initial promises if there aren't any already or,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need another fallback? (like remove policies if they are corrupted?)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a reset ?

@fanf
Copy link
Member

fanf commented Mar 26, 2019

ping @peckpeck (a chat with @amousset may be needed)

@ncharles
Copy link
Member

you should remove the copy l322 and 323 (can't link it in conversation somehow)

cp -r initial-promises/ $(DESTDIR)/opt/rudder/share/

@peckpeck peckpeck force-pushed the arch_14182/remove_initial_promises_from_rudder_agent_package branch from 715f689 to 87d3380 Compare April 26, 2019 07:37
@peckpeck
Copy link
Member Author

Commit modified

@Normation-Quality-Assistant
Copy link
Contributor

OK, merging this PR

@Normation-Quality-Assistant Normation-Quality-Assistant merged commit 87d3380 into Normation:master Apr 29, 2019
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants