Fixes #9012: Remove migration scripts for 2.10-3.0 in 4.0 #1072
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ncharles
requested changes
Sep 20, 2016
| @@ -341,9 +328,6 @@ upgrade_ncf() { | |||
| fi | |||
|
|
|||
| if [ -f ${CONFIGURATION_REPOSITORY}/ncf/ncf.conf ]; then | |||
| # 2.9.0 & 2.11.11, 3.0.5: Make sure that ncf uses the right logger bundles (_logger_default and logger_rudder) | |||
| STEP="Make sure that ncf uses the right logger bundles (_logger_default and logger_rudder)" | |||
There was a problem hiding this comment.
I think the comment should stay, but in a modified form, reflecting what is done below:
Make sure that ncf uses the right logger bundles (_log_default and log_rudder)"
| if ! cat ${CONFIGURATION_REPOSITORY}/ncf/ncf.conf | perl -p0e "s/\n/%%%%%/g" | egrep -q "classes.community_edition[^%]*%%%%%cfengine_port=5309"; then | ||
| cat ${CONFIGURATION_REPOSITORY}/ncf/ncf.conf | perl -p0e "s/\n/%%%%%/g" | sed "s/\(classes.community_edition[^%]*%%%%%cfengine_port=\)[0-9]\+/\15309/" | perl -p0e "s/%%%%%/\n/g" > ${CONFIGURATION_REPOSITORY}/ncf/ncf.conf.new | ||
| mv ${CONFIGURATION_REPOSITORY}/ncf/ncf.conf.new ${CONFIGURATION_REPOSITORY}/ncf/ncf.conf | ||
| fi |
There was a problem hiding this comment.
oh, nice catch. it took me a while to understand that it was indeed not needed (ncf.conf has a lot of magic)
| @@ -670,21 +557,6 @@ upgrade_inventory() { | |||
| # Check if the LDAP has been initialised | |||
| LDAP_EXISTS=$(${LDAPSEARCH} -b "cn=rudder-configuration" -s base dn 2>/dev/null | grep -c "dn: cn=rudder-configuration" || true) | |||
|
|
|||
| ## 2.4.0 : Change attribute from dn:ruleId=inventory-all,ou=Rules,ou=Rudder,cn=rudder-configuration | |||
There was a problem hiding this comment.
it was about time to remove it :)
ncharles
reviewed
Sep 20, 2016
| # - 3.0.0 : File Format migration from 5 to 6 | ||
| # - 3.0.0 : Add the insertionId column in the ReportsExecution table and fill its value for last nodes run | ||
| # - 3.0.0 : Replace varchar by text in the database | ||
| # - 3.0.2 : Check for the PostgreSQL version (>= 8.4) |
There was a problem hiding this comment.
i didn't see that one removed below, are you sure you want to remove it ?
peckpeck
force-pushed
the
ust_9012/remove_migration_scripts_for_2_10_3_0_in_4_0
branch
from
2c6b2c1
to
7dbc4e3
Compare
|
Commit modified |
|
@ncharles: could you review the modification and merge if OK? |
jooooooon
reviewed
Sep 21, 2016
| ${PSQL} -d rudder -f ${RUDDER_UPGRADE_TOOLS}/dbMigration-2.11-3.0-set-migration-needed-flag-for-EventLog.sql > /dev/null 2>&1 | ||
| fi | ||
|
|
||
| : | ||
| } |
|
OK, merging this PR |
peckpeck
deleted the
ust_9012/remove_migration_scripts_for_2_10_3_0_in_4_0
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.rudder-project.org/redmine/issues/9012