Merge "Add environment to enable nova on undercloud"
This commit is contained in:
commit
b0d3732564
@ -5,5 +5,4 @@ resource_registry:
|
||||
OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml
|
||||
OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml
|
||||
OS::TripleO::Services::IronicPxe: ../../deployment/ironic/ironic-pxe-container-puppet.yaml
|
||||
OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml
|
||||
OS::TripleO::Services::IronicNeutronAgent: ../../deployment/ironic/ironic-neutron-agent-container-puppet.yaml
|
||||
|
33
environments/undercloud-enable-nova.yaml
Normal file
33
environments/undercloud-enable-nova.yaml
Normal file
@ -0,0 +1,33 @@
|
||||
# This heat environment can be used to enable the nova/glance services used on
|
||||
# the undercloud.
|
||||
|
||||
parameter_defaults:
|
||||
NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
|
||||
NovaSchedulerDefaultFilters: ['TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter']
|
||||
NovaSchedulerMaxAttempts: 30
|
||||
# Disable compute auto disabling:
|
||||
# As part of Pike, nova introduced a change to have the nova-compute
|
||||
# process automatically disable the nova-compute instance in the case of
|
||||
# consecutive build failures. This can lead to odd errors when deploying
|
||||
# the ironic nodes on the undercloud as you end up with a ComputeFilter
|
||||
# error. This parameter disables this functionality for the undercloud since
|
||||
# we do not want the nova-compute instance running on the undercloud for
|
||||
# Ironic to be disabled in the case of multiple deployment failures.
|
||||
NovaAutoDisabling: '0'
|
||||
NovaCorsAllowedOrigin: '*'
|
||||
NovaSyncPowerStateInterval: -1
|
||||
# Overwrite compute_server_user policy to allow any user with role admin
|
||||
# to post to novajoin (required for mistral workflow)
|
||||
NovajoinPolicies:
|
||||
compute_service_user:
|
||||
key: 'compute_service_user'
|
||||
value: 'role:admin'
|
||||
MistralExecutorVolumes:
|
||||
- /var/lib/config-data/nova/etc/nova:/etc/nova:ro
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Services::NovaApi: ../deployment/nova/nova-api-container-puppet.yaml
|
||||
OS::TripleO::Services::NovaConductor: ../deployment/nova/nova-conductor-container-puppet.yaml
|
||||
OS::TripleO::Services::NovaIronic: ../deployment/nova/nova-ironic-container-puppet.yaml
|
||||
OS::TripleO::Services::NovaScheduler: ../deployment/nova/nova-scheduler-container-puppet.yaml
|
||||
OS::TripleO::Services::GlanceApi: ../deployment/glance/glance-api-container-puppet.yaml
|
@ -40,7 +40,12 @@ resource_registry:
|
||||
OS::TripleO::Services::CinderScheduler: OS::Heat::None
|
||||
OS::TripleO::Services::CinderVolume: OS::Heat::None
|
||||
OS::TripleO::Services::HeatApiCfn: OS::Heat::None
|
||||
OS::TripleO::Services::NovaApi: OS::Heat::None
|
||||
OS::TripleO::Services::NovaConductor: OS::Heat::None
|
||||
OS::TripleO::Services::NovaIronic: OS::Heat::None
|
||||
OS::TripleO::Services::NovaMetadata: OS::Heat::None
|
||||
OS::TripleO::Services::NovaScheduler: OS::Heat::None
|
||||
OS::TripleO::Services::GlanceApi: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
|
||||
|
||||
# Services we don't ever want configured. See LP#1824030
|
||||
@ -81,26 +86,6 @@ parameter_defaults:
|
||||
NeutronBridgeMappings: ctlplane:br-ctlplane
|
||||
NeutronAgentExtensions: []
|
||||
NeutronFlatNetworks: '*'
|
||||
NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
|
||||
NovaSchedulerDefaultFilters: ['TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter']
|
||||
NovaSchedulerMaxAttempts: 30
|
||||
# Disable compute auto disabling:
|
||||
# As part of Pike, nova introduced a change to have the nova-compute
|
||||
# process automatically disable the nova-compute instance in the case of
|
||||
# consecutive build failures. This can lead to odd errors when deploying
|
||||
# the ironic nodes on the undercloud as you end up with a ComputeFilter
|
||||
# error. This parameter disables this functionality for the undercloud since
|
||||
# we do not want the nova-compute instance running on the undercloud for
|
||||
# Ironic to be disabled in the case of multiple deployment failures.
|
||||
NovaAutoDisabling: '0'
|
||||
NovaCorsAllowedOrigin: '*'
|
||||
NovaSyncPowerStateInterval: -1
|
||||
# Overwrite compute_server_user policy to allow any user with role admin
|
||||
# to post to novajoin (required for mistral workflow)
|
||||
NovajoinPolicies:
|
||||
compute_service_user:
|
||||
key: 'compute_service_user'
|
||||
value: 'role:admin'
|
||||
HeatConvergenceEngine: true
|
||||
HeatCorsAllowedOrigin: '*'
|
||||
HeatMaxNestedStackDepth: 7
|
||||
@ -148,8 +133,6 @@ parameter_defaults:
|
||||
ZaqarManagementStore: 'sqlalchemy'
|
||||
MistralCorsAllowedOrigin: '*'
|
||||
MistralExecutionFieldSizeLimit: 16384
|
||||
MistralExecutorVolumes:
|
||||
- /var/lib/config-data/nova/etc/nova:/etc/nova:ro
|
||||
NeutronServicePlugins: router,segments
|
||||
NeutronMechanismDrivers: ['openvswitch', 'baremetal']
|
||||
NeutronNetworkVLANRanges: 'physnet1:1000:2999'
|
||||
|
Loading…
Reference in New Issue
Block a user