Merge "Replaced references to tcpcloud image with Mirantis ones"
diff --git a/src/com/mirantis/mk/Debian.groovy b/src/com/mirantis/mk/Debian.groovy
index 2b5444c..4d7b1ee 100644
--- a/src/com/mirantis/mk/Debian.groovy
+++ b/src/com/mirantis/mk/Debian.groovy
@@ -155,7 +155,15 @@
else
NEW_VERSION=\$VERSION+\$TIMESTAMP.`git rev-parse --short HEAD`$revisionPostfix
fi &&
- sudo -H -E -u jenkins gbp dch --auto --multimaint-merge --ignore-branch --new-version=\$NEW_VERSION --distribution `lsb_release -c -s` --force-distribution &&
+ sudo -H -E -u jenkins gbp dch \
+ --auto \
+ --git-author \
+ --id-length=7 \
+ --git-log='--reverse' \
+ --ignore-branch \
+ --new-version=\$NEW_VERSION \
+ --distribution `lsb_release -c -s` \
+ --force-distribution &&
sudo -H -E -u jenkins git add -u debian/changelog &&
sudo -H -E -u jenkins git commit -m "New snapshot version \$NEW_VERSION"
) &&
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 0d9cb5c..a5beb4d 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -52,6 +52,11 @@
if (salt.testTarget(master, 'I@iptables:service')) {
salt.enforceState(master, 'I@iptables:service', 'iptables')
}
+
+ // Install and configure logrotate
+ if (salt.testTarget(master, 'I@logrotate:server')) {
+ salt.enforceState(master, 'I@logrotate:server', 'logrotate')
+ }
}
def installFoundationInfraOnTarget(master, target, staticMgmtNet=false) {