diff options
author | 2016-05-10 14:29:00 +0800 | |
---|---|---|
committer | 2016-05-10 14:32:55 +0800 | |
commit | d25a4b3c636bf8f78199f2fe493170fc3c39b8c3 (patch) | |
tree | 3b155de7259c84219fcb1447c15c2b6bdb43f5f5 /testsuites/rubbos/puppet_manifests | |
parent | 9a4afd44ae162b4649771b674990ebe9bc6da720 (diff) |
Replace puppet node definition with regular expression
The old method of node definition is a hostname string.
It is not generic and problematic in OpenStack.
Puppet agents send FQDN instead of hostname during catalog execution.
JIRA: BOTTLENECK-76
Change-Id: Icd004d0450ff84fc890e7962f8767cfbde90a9ad
Signed-off-by: wangyaoguang <sunshine.wang@huawei.com>
Diffstat (limited to 'testsuites/rubbos/puppet_manifests')
-rw-r--r-- | testsuites/rubbos/puppet_manifests/site_off.pp | 8 | ||||
-rw-r--r-- | testsuites/rubbos/puppet_manifests/site_on.pp | 8 |
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 |