diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-02 10:00:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-02 10:00:14 +0000 |
| commit | d6837ea4a62ec74c4b06901c257fe4d6f4bea73c (patch) | |
| tree | f6d252cfb4026674c7133e8b863c5e5f0a9d0ce1 /puppet/services/ironic-conductor.yaml | |
| parent | 3a5d28c4739d3f79c7b10af169f110f9a10f61bb (diff) | |
| parent | 25ad7b8e1eeeb0e1f5f83b9f7560502717b44536 (diff) | |
Merge "Availability monitoring agents support"
Diffstat (limited to 'puppet/services/ironic-conductor.yaml')
| -rw-r--r-- | puppet/services/ironic-conductor.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 4008f977..97369cdd 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -22,6 +22,9 @@ parameters: default: ['pxe_ipmitool', 'agent_ipmitool'] description: Enabled Ironic drivers type: comma_delimited_list + MonitoringSubscriptionIronicConductor: + default: 'overcloud-ironic-conductor' + type: string resources: IronicBase: @@ -36,6 +39,7 @@ outputs: description: Role data for the Ironic conductor role. value: service_name: ironic_conductor + monitoring_subscription: {get_param: MonitoringSubscriptionIronicConductor} config_settings: map_merge: - get_attr: [IronicBase, role_data, config_settings] |