Merge "Don't create/configure swift_temp_url_key"
This commit is contained in:
commit
a28c3e4c5e
|
@ -24,6 +24,7 @@ parameter_defaults:
|
||||||
value: 'role:admin'
|
value: 'role:admin'
|
||||||
MistralExecutorVolumes:
|
MistralExecutorVolumes:
|
||||||
- /var/lib/config-data/nova/etc/nova:/etc/nova:ro
|
- /var/lib/config-data/nova/etc/nova:/etc/nova:ro
|
||||||
|
IronicConfigureSwiftTempUrlKey: true
|
||||||
|
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::NovaApi: ../deployment/nova/nova-api-container-puppet.yaml
|
OS::TripleO::Services::NovaApi: ../deployment/nova/nova-api-container-puppet.yaml
|
||||||
|
|
|
@ -132,6 +132,7 @@ parameter_defaults:
|
||||||
# - ip_range: '192.168.24.100,192.168.24.200'
|
# - ip_range: '192.168.24.100,192.168.24.200'
|
||||||
IronicInspectorUseSwift: false
|
IronicInspectorUseSwift: false
|
||||||
IronicInspectorStorageBackend: 'database'
|
IronicInspectorStorageBackend: 'database'
|
||||||
|
IronicConfigureSwiftTempUrlKey: false
|
||||||
IronicProvisioningNetwork: 'ctlplane'
|
IronicProvisioningNetwork: 'ctlplane'
|
||||||
IronicRescuingNetwork: 'ctlplane'
|
IronicRescuingNetwork: 'ctlplane'
|
||||||
NeutronServicePlugins: router,segments
|
NeutronServicePlugins: router,segments
|
||||||
|
|
Loading…
Reference in New Issue