diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-26 18:02:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-26 18:02:11 +0000 |
| commit | 7c8874c920c42b3c78ba140e895aa1884d6a1d29 (patch) | |
| tree | c64f13dc83220b4c57108d85ab0a372225e04342 /puppet | |
| parent | 7f58487cdad9c11b60ba9025635bd6f71b2ae03e (diff) | |
| parent | a30d1745f91a84e5eda2aca6d981942c9ef66807 (diff) | |
Merge "Fix base service type inheriting gnocchi service templates"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/pacemaker/gnocchi-api.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/pacemaker/gnocchi-metricd.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/pacemaker/gnocchi-statsd.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/puppet/services/pacemaker/gnocchi-api.yaml b/puppet/services/pacemaker/gnocchi-api.yaml index 50bd3fa7..42c7131d 100644 --- a/puppet/services/pacemaker/gnocchi-api.yaml +++ b/puppet/services/pacemaker/gnocchi-api.yaml @@ -21,7 +21,7 @@ parameters: resources: GnocchiServiceBase: - type: ../gnocchi-base.yaml + type: ../gnocchi-api.yaml properties: ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} diff --git a/puppet/services/pacemaker/gnocchi-metricd.yaml b/puppet/services/pacemaker/gnocchi-metricd.yaml index 0a6b03ea..177d7744 100644 --- a/puppet/services/pacemaker/gnocchi-metricd.yaml +++ b/puppet/services/pacemaker/gnocchi-metricd.yaml @@ -21,7 +21,7 @@ parameters: resources: GnocchiServiceBase: - type: ../gnocchi-base.yaml + type: ../gnocchi-metricd.yaml properties: ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} diff --git a/puppet/services/pacemaker/gnocchi-statsd.yaml b/puppet/services/pacemaker/gnocchi-statsd.yaml index 12256d32..a247a514 100644 --- a/puppet/services/pacemaker/gnocchi-statsd.yaml +++ b/puppet/services/pacemaker/gnocchi-statsd.yaml @@ -21,7 +21,7 @@ parameters: resources: GnocchiServiceBase: - type: ../gnocchi-base.yaml + type: ../gnocchi-statsd.yaml properties: ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} |