From 168961d66d0cbf089224848c66bc453677fe1748 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Thu, 3 Sep 2020 14:02:31 +0530 Subject: [PATCH] Add environment to enable nova on undercloud This sets the nova/glance services to OS::Heat::None in default undercloud environment and adds environment file to enable nova (if needed). Once tripleoclient has been changed to flip the nova_enable flag, we can drop undercloud-disable-nova.yaml Partial-Bug : #1891242 Depends-On: https://review.opendev.org/#/c/749659/ Change-Id: I88aaa58f49eb8a2dc38232132d0397a83c76104e --- environments/services/ironic.yaml | 1 - environments/undercloud-enable-nova.yaml | 33 ++++++++++++++++++++++++ environments/undercloud.yaml | 27 ++++--------------- 3 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 environments/undercloud-enable-nova.yaml diff --git a/environments/services/ironic.yaml b/environments/services/ironic.yaml index 03d401d530..4870cfbb0a 100644 --- a/environments/services/ironic.yaml +++ b/environments/services/ironic.yaml @@ -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 diff --git a/environments/undercloud-enable-nova.yaml b/environments/undercloud-enable-nova.yaml new file mode 100644 index 0000000000..b49851d47e --- /dev/null +++ b/environments/undercloud-enable-nova.yaml @@ -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 diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 4de76b4942..e5248f042b 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.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'