openstack
/
charm-ironic-conductor
Code Issues Proposed changes

Config updates 

* Fix service-auth typo
  * Add nova section (allows sending power states to nova)
  * Add swift section (needs to be configured automatically - WiP)
This commit is contained in:
Gabriel Adrian Samfira 2020-09-08 12:18:55 +00:00
parent e79e652654
commit e97054286b
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.yaml
View File

@ -76,5 +76,19 @@ options:
Enabling this option will preserve the data on disk after release (not
recommended for production).
provisioning-network:
default: deployment
type: string
description: |
The name or ID of the provisioning network. This network is used to deploy
bare metal nodes. This option is mandatory to allow Neutron network interfaces.
cleaning-network:
default: deployment
type: string
description: |
The name or ID of the cleaning network. This network is used to clean
bare metal nodes after they have been releases. This option is mandatory
to allow Neutron network interfaces. The same network may be used for both
cleaning and provisioning.

2
templates/parts/service-auth
View File

@ -14,7 +14,7 @@ password = {{ identity_credentials.credentials_password }}
project_name = {{identity_credentials.credentials_project}}
{% if identity_credentials.service_domain -%}
{% if identity_credentials.credentials_project_domain_name -%}
project_domain_name = {{ identity_credentials.credentials_project_domain_name }}
user_domain_name = {{ identity_credentials.credentials_user_domain_name }}
{% else -%}

27
templates/train/ironic.conf
View File

@ -4,7 +4,7 @@ verbose = {{ options.verbose }}
auth_strategy=keystone
my_ip = {{ options.internal_interface_ip }}
enabled_deploy_interfaces = iscsi
enabled_deploy_interfaces = iscsi,direct
enabled_hardware_types = ipmi,ilo,idrac,redfish,irmc
{% if options.use_ipxe -%}
enabled_boot_interfaces = pxe,ipxe,ilo-pxe,ilo-ipxe,irmc-pxe
@ -30,20 +30,27 @@ transport_url = {{ amqp.transport_url }}
[database]
{% include "parts/database" %}
[nova]
{% include "parts/service-auth" %}
[neutron]
{% include "parts/service-auth" %}
# {% if options.cleaning_network %}
# cleaning_network = {{ options.cleaning_network }}
# {% endif %}
# {% if options.provisioning_network %}
# provisioning_network = {{ options.provisioning_network }}
# {% endif %}
cleaning_network = 512147a6-37ed-4ab4-ac4c-c55bb845de8e
provisioning_network = 512147a6-37ed-4ab4-ac4c-c55bb845de8e
{% if options.cleaning_network %}
cleaning_network = {{ options.cleaning_network }}
{% endif %}
{% if options.provisioning_network %}
provisioning_network = {{ options.provisioning_network }}
{% endif %}
[glance]
{% include "parts/service-auth" %}
# swift_container = {{ swift_container }}
# swift_temp_url_key = {{ tmp_url_key }}
swift_container = glance
swift_temp_url_key = secret
[swift]
{% include "parts/service-auth" %}
[cinder]
{% include "parts/service-auth" %}