diff options
author | 2016-08-26 11:42:07 +0000 | |
---|---|---|
committer | 2016-08-26 11:42:07 +0000 | |
commit | ac27b9680984d9654b7bdc8bea2e729bd959df09 (patch) | |
tree | b8a161f29803fe93d52bfa9d85188865c5ddd199 /puppet/services/ironic-conductor.yaml | |
parent | e95304e58ac5bee7cf6f71e4525fbea3f1839828 (diff) | |
parent | fc614ec1a3a6d10d75af46cd7915fbc0e45ffcc3 (diff) |
Merge "Ironic: add missing haproxy and firewall configuration"
Diffstat (limited to 'puppet/services/ironic-conductor.yaml')
-rw-r--r-- | puppet/services/ironic-conductor.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 9bc86a2c..27479f79 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -41,10 +41,15 @@ outputs: - get_attr: [IronicBase, role_data, config_settings] # FIXME: I have no idea why neutron_url is in "api" manifest - ironic::api::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]} + ironic::conductor::api_url: {get_param: [EndpointMap, IronicInternal, uri_no_suffix]} ironic::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} ironic::enabled_drivers: {get_param: IronicEnabledDrivers} # 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} + tripleo.ironic_conductor.firewall_rules: + '134 ironic conductor TFTP': + dport: 69 + proto: udp step_config: | include ::tripleo::profile::base::ironic::conductor |