summaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2016-05-10 13:56:30 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-10 13:56:30 +0000
commitace65ab15346359967748fa30dfb101213ea282d (patch)
tree42c96e52951aaceb27193b39e09e05f8654c8091 /testsuites
parent33d7006546e40ca96013dbe49c9b7dedb9325415 (diff)
parentd25a4b3c636bf8f78199f2fe493170fc3c39b8c3 (diff)
Merge "Replace puppet node definition with regular expression"
Diffstat (limited to 'testsuites')
-rw-r--r--testsuites/rubbos/puppet_manifests/site_off.pp8
-rw-r--r--testsuites/rubbos/puppet_manifests/site_on.pp8
2 files changed, 8 insertions, 8 deletions
diff --git a/testsuites/rubbos/puppet_manifests/site_off.pp b/testsuites/rubbos/puppet_manifests/site_off.pp
index 05663ebb..a0d0b5e1 100644
--- a/testsuites/rubbos/puppet_manifests/site_off.pp
+++ b/testsuites/rubbos/puppet_manifests/site_off.pp
@@ -11,25 +11,25 @@
node default { }
# mysql node:
-node REPLACED_MYSQL_NODES {
+node /.*rubbos[-|_]mysql.*/ {
include rubbos_mysql::rubbos_mysql_off
include rubbos_monitor::rubbos_monitor_off
}
# tomcat node:
-node REPLACED_TOMCAT_NODES {
+node /.*rubbos[-|_]tomcat.*/ {
include rubbos_tomcat::rubbos_tomcat_off
include rubbos_monitor::rubbos_monitor_off
}
# httpd node:
-node REPLACED_HTTPD_NODES {
+node /.*rubbos[-|_]httpd.*/ {
include rubbos_httpd::rubbos_httpd_off
include rubbos_monitor::rubbos_monitor_off
}
# clients
-node REPLACED_CLIENT_NODES {
+node /.*rubbos[-|_]client.*/ {
include rubbos_monitor::rubbos_monitor_off
include rubbos_client::rubbos_client_off
}
diff --git a/testsuites/rubbos/puppet_manifests/site_on.pp b/testsuites/rubbos/puppet_manifests/site_on.pp
index edec33cf..a9164ea5 100644
--- a/testsuites/rubbos/puppet_manifests/site_on.pp
+++ b/testsuites/rubbos/puppet_manifests/site_on.pp
@@ -11,28 +11,28 @@
node default { }
# mysql node:
-node REPLACED_MYSQL_NODES {
+node /.*rubbos[-|_]mysql.*/ {
include rubbos_common::rubbos_common_on
include rubbos_mysql::rubbos_mysql_on
include rubbos_monitor::rubbos_monitor_on
}
# tomcat node:
-node REPLACED_TOMCAT_NODES {
+node /.*rubbos[-|_]tomcat.*/ {
include rubbos_common::rubbos_common_on
include rubbos_tomcat::rubbos_tomcat_on
include rubbos_monitor::rubbos_monitor_on
}
# httpd node:
-node REPLACED_HTTPD_NODES {
+node /.*rubbos[-|_]httpd.*/ {
include rubbos_common::rubbos_common_on
include rubbos_httpd::rubbos_httpd_on
include rubbos_monitor::rubbos_monitor_on
}
# clients
-node REPLACED_CLIENT_NODES {
+node /.*rubbos[-|_]client.*/ {
include rubbos_common::rubbos_common_on
include rubbos_monitor::rubbos_monitor_on
include rubbos_client::rubbos_client_on