You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/05/28 18:05:24 UTC
[08/21] git commit: Fix formula directory listing and other
configuration issues with templates
Fix formula directory listing and other configuration issues with templates
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5d175458
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5d175458
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5d175458
Branch: refs/heads/master
Commit: 5d17545808cfaf9dfbc4e676794265f48eac06e8
Parents: 4828b16
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Wed Oct 23 15:54:36 2013 +0100
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Wed May 28 15:14:04 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/entity/salt/SaltTasks.java | 2 +-
.../main/resources/brooklyn/entity/salt/master | 9 ++++-----
.../resources/brooklyn/entity/salt/masterless | 21 +++++++++-----------
.../main/resources/brooklyn/entity/salt/minion | 15 ++++++--------
4 files changed, 20 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5d175458/software/base/src/main/java/brooklyn/entity/salt/SaltTasks.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/salt/SaltTasks.java b/software/base/src/main/java/brooklyn/entity/salt/SaltTasks.java
index b413d86..2be4037 100644
--- a/software/base/src/main/java/brooklyn/entity/salt/SaltTasks.java
+++ b/software/base/src/main/java/brooklyn/entity/salt/SaltTasks.java
@@ -134,7 +134,7 @@ public class SaltTasks {
}
public static TaskFactory<?> runSalt(String runDir) {
- return SshEffectorTasks.ssh(cdAndRun(runDir, BashCommands.sudo("salt-call --local state.highstate")))
+ return SshEffectorTasks.ssh(cdAndRun(runDir, BashCommands.sudo("salt-call state.highstate")))
.summary("run salt install")
.requiringExitCodeZero();
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5d175458/software/base/src/main/resources/brooklyn/entity/salt/master
----------------------------------------------------------------------
diff --git a/software/base/src/main/resources/brooklyn/entity/salt/master b/software/base/src/main/resources/brooklyn/entity/salt/master
index 1345349..0f5ccc3 100644
--- a/software/base/src/main/resources/brooklyn/entity/salt/master
+++ b/software/base/src/main/resources/brooklyn/entity/salt/master
@@ -28,13 +28,12 @@
#worker_threads: 5
ret_port: ${entity.saltPort,c} # 4506
-root_dir: ${runDir}/
+root_dir: /
pidfile: ${driver.pidFile}
-pki_dir: pki
-cachedir: cache
-sock_dir: sock
+pki_dir: ${runDir}/pki
+cachedir: ${runDir}/cache
log_file: ${driver.logFileLocation}
-key_logfile: key.log
+key_logfile: ${runDir}/key.log
#verify_env: True
#keep_jobs: 24
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5d175458/software/base/src/main/resources/brooklyn/entity/salt/masterless
----------------------------------------------------------------------
diff --git a/software/base/src/main/resources/brooklyn/entity/salt/masterless b/software/base/src/main/resources/brooklyn/entity/salt/masterless
index 9ecadec..5477bc8 100644
--- a/software/base/src/main/resources/brooklyn/entity/salt/masterless
+++ b/software/base/src/main/resources/brooklyn/entity/salt/masterless
@@ -19,28 +19,25 @@
# /etc/salt/minion
##
-#default_include: minion.d/*.conf
-
# Minion configuration
id: ${entity.id}
user: root
backup_mode: minion
# Directory settings
-root_dir: ${runDir}/
-pidfile: salt-minion.pid
-pki_dir: pki
-cachedir: cache
-sock_dir: sock
-log_file: minion.log
-key_logfile: key.log
+root_dir: /
+pidfile: ${runDir}/salt-minion.pid
+pki_dir: ${runDir}/pki
+cachedir: ${runDir}/cache
+log_file: ${runDir}/minion.log
+key_logfile: ${runDir}/key.log
file_client: local
file_roots:
base:
- - ${installDir}/base
-[#list formulas.entrySet() as entry]
- - ${installDir}/base/${entry.key}
+ - ${runDir}/base
+[#list formulas?keys as formulaName]
+ - ${installDir}/${formulaName}
[/#list]
#verify_env: True
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5d175458/software/base/src/main/resources/brooklyn/entity/salt/minion
----------------------------------------------------------------------
diff --git a/software/base/src/main/resources/brooklyn/entity/salt/minion b/software/base/src/main/resources/brooklyn/entity/salt/minion
index e90d8de..34f6caf 100644
--- a/software/base/src/main/resources/brooklyn/entity/salt/minion
+++ b/software/base/src/main/resources/brooklyn/entity/salt/minion
@@ -19,8 +19,6 @@
# /etc/salt/minion
##
-#default_include: minion.d/*.conf
-
# The salt master server
master: ${entity.master.hostname}
ipv6: False
@@ -35,13 +33,12 @@ user: root
backup_mode: minion
# Directory settings
-root_dir: ${runDir}/
-pidfile: salt-minion.pid
-pki_dir: pki
-cachedir: cache
-sock_dir: sock
-log_file: minion.log
-key_logfile: key.log
+root_dir: /
+pidfile: ${runDir}/salt-minion.pid
+pki_dir: ${runDir}/pki
+cachedir: ${runDir}/cache
+log_file: ${runDir}/minion.log
+key_logfile: ${runDir}/key.log
#verify_env: True
#cache_jobs: True # Debugging