X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fironic-conductor.yaml;h=a3bce305c82286302a57225c2283c9804bf76960;hb=2c877c9c4b08983ac2d45e1c2c2a8da60f608ad5;hp=3fb3d9fd2d2aad374a3a3d3662e03399c0adc760;hpb=ddda39b3c7ef90d0175f8424bee51abe94a9b6fc;p=apex-tripleo-heat-templates.git diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 3fb3d9fd..a3bce305 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -24,6 +24,7 @@ outputs: role_data: description: Role data for the Ironic conductor role. value: + service_name: ironic_conductor config_settings: map_merge: - get_attr: [IronicBase, role_data, config_settings] @@ -31,6 +32,5 @@ outputs: # Prevent tftp_server from defaulting to my_ip setting, which is # controller VIP, not a real IP. ironic::drivers::pxe::tftp_server: {get_input: ironic_api_network} - step_config: | include ::tripleo::profile::base::ironic::conductor