Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Conflicts:
tools/puppet3/manifests/nodes.pp
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/15e53533
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/15e53533
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/15e53533
Branch: refs/heads/master
Commit: 15e535332841582382b3be3484e051d1870f8775
Parents: 89983ec 348fc62
Author: Udara Liyanage <[email protected]>
Authored: Mon Mar 31 17:21:00 2014 -0400
Committer: Udara Liyanage <[email protected]>
Committed: Mon Mar 31 17:21:00 2014 -0400
----------------------------------------------------------------------
tools/puppet3-agent/config.sh | 6 +++---
tools/puppet3/manifests/nodes.pp | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/15e53533/tools/puppet3/manifests/nodes.pp
----------------------------------------------------------------------
diff --cc tools/puppet3/manifests/nodes.pp
index 23e6141,36e6d2b..cf7cf73
--- a/tools/puppet3/manifests/nodes.pp
+++ b/tools/puppet3/manifests/nodes.pp
@@@ -117,3 -117,39 +117,9 @@@ node /wordpress/ inherits base
class {'mysql':}
}
+
+ # default (base) cartridge node
+ node /default/ inherits base {
+ require java
+ class {'agent':}
+ }
-
-# stratos components related nodes
-# not supported in alpha version.
-node 'autoscaler.wso2.com' inherits base {
- require java
- class {'autoscaler': maintenance_mode => 'norestart',}
-}
-
-node 'cc.wso2.com' inherits base {
- require java
- class {'cc': maintenance_mode => 'norestart',}
-}
-
-node 'cep.wso2.com' inherits base {
- require java
- class {'cep': maintenance_mode => 'norestart',}
-}
-
-
-node 'mb.wso2.com' inherits base {
- require java
- class {'messagebroker': maintenance_mode => 'norestart',}
-}
-
-node 'sc.wso2.com' inherits base {
- require java
- class {'manager': maintenance_mode => 'norestart',}
-}
-
-
