diff --git a/environments/services/undercloud-aodh.yaml b/environments/services/undercloud-aodh.yaml index 95d4a87341..00ca8f4f05 100644 --- a/environments/services/undercloud-aodh.yaml +++ b/environments/services/undercloud-aodh.yaml @@ -1,5 +1,7 @@ +# DEPRECATED. This file will be removed in the Stein release as it is no longer +# needed resource_registry: - OS::TripleO::Services::UndercloudAodhApi: ../../docker/services/aodh-api.yaml - OS::TripleO::Services::UndercloudAodhEvaluator: ../../docker/services/aodh-evaluator.yaml - OS::TripleO::Services::UndercloudAodhNotifier: ../../docker/services/aodh-notifier.yaml - OS::TripleO::Services::UndercloudAodhListener: ../../docker/services/aodh-listener.yaml + OS::TripleO::Services::AodhApi: ../../docker/services/aodh-api.yaml + OS::TripleO::Services::AodhEvaluator: ../../docker/services/aodh-evaluator.yaml + OS::TripleO::Services::AodhNotifier: ../../docker/services/aodh-notifier.yaml + OS::TripleO::Services::AodhListener: ../../docker/services/aodh-listener.yaml diff --git a/environments/services/undercloud-ceilometer.yaml b/environments/services/undercloud-ceilometer.yaml index ca55b4d999..a696d4dc95 100644 --- a/environments/services/undercloud-ceilometer.yaml +++ b/environments/services/undercloud-ceilometer.yaml @@ -1,4 +1,6 @@ +# DEPRECATED. This file will be removed in the Stein release as it is no longer +# needed resource_registry: - OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../docker/services/ceilometer-agent-central.yaml - OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml - OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml + OS::TripleO::Services::CeilometerAgentCentral: ../../docker/services/ceilometer-agent-central.yaml + OS::TripleO::Services::CeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml + OS::TripleO::Services::CeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml diff --git a/environments/services/undercloud-cinder.yaml b/environments/services/undercloud-cinder.yaml index d382debb26..a46359b93f 100644 --- a/environments/services/undercloud-cinder.yaml +++ b/environments/services/undercloud-cinder.yaml @@ -1,4 +1,6 @@ +# DEPRECATED. This file will be removed in the Stein release as it is no longer +# needed resource_registry: - OS::TripleO::Services::UndercloudCinderApi: ../../docker/services/cinder-api.yaml - OS::TripleO::Services::UndercloudCinderScheduler: ../../docker/services/cinder-scheduler.yaml - OS::TripleO::Services::UndercloudCinderVolume: ../../docker/services/cinder-volume.yaml + OS::TripleO::Services::CinderApi: ../../docker/services/cinder-api.yaml + OS::TripleO::Services::CinderScheduler: ../../docker/services/cinder-scheduler.yaml + OS::TripleO::Services::CinderVolume: ../../docker/services/cinder-volume.yaml diff --git a/environments/services/undercloud-gnocchi.yaml b/environments/services/undercloud-gnocchi.yaml index bf7f2a9dc9..a508841755 100644 --- a/environments/services/undercloud-gnocchi.yaml +++ b/environments/services/undercloud-gnocchi.yaml @@ -1,5 +1,7 @@ +# DEPRECATED. This file will be removed in the Stein release as it is no longer +# needed resource_registry: - OS::TripleO::Services::UndercloudGnocchiApi: ../../docker/services/gnocchi-api.yaml - OS::TripleO::Services::UndercloudGnocchiMetricd: ../../docker/services/gnocchi-metricd.yaml - OS::TripleO::Services::UndercloudGnocchiStatsd: ../../docker/services/gnocchi-statsd.yaml - OS::TripleO::Services::UndercloudRedis: ../../docker/services/database/redis.yaml + OS::TripleO::Services::GnocchiApi: ../../docker/services/gnocchi-api.yaml + OS::TripleO::Services::GnocchiMetricd: ../../docker/services/gnocchi-metricd.yaml + OS::TripleO::Services::GnocchiStatsd: ../../docker/services/gnocchi-statsd.yaml + OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml diff --git a/environments/services/undercloud-haproxy.yaml b/environments/services/undercloud-haproxy.yaml index 0f8427d302..a2cb5b7582 100644 --- a/environments/services/undercloud-haproxy.yaml +++ b/environments/services/undercloud-haproxy.yaml @@ -1,2 +1,4 @@ +# DEPRECATED. This file will be removed in the Stein release as it is no longer +# needed resource_registry: - OS::TripleO::Services::UndercloudHAProxy: ../../docker/services/haproxy.yaml + OS::TripleO::Services::HAproxy: ../../docker/services/haproxy.yaml diff --git a/environments/services/undercloud-keepalived.yaml b/environments/services/undercloud-keepalived.yaml index 79af8e8db4..5bafe0027d 100644 --- a/environments/services/undercloud-keepalived.yaml +++ b/environments/services/undercloud-keepalived.yaml @@ -1,2 +1,4 @@ +# DEPRECATED. This file will be removed in the Stein release as it is no longer +# needed resource_registry: - OS::TripleO::Services::UndercloudKeepalived: ../../docker/services/keepalived.yaml + OS::TripleO::Services::Keepalived: ../../docker/services/keepalived.yaml diff --git a/environments/services/undercloud-panko.yaml b/environments/services/undercloud-panko.yaml index 8384f31145..a19faa74dc 100644 --- a/environments/services/undercloud-panko.yaml +++ b/environments/services/undercloud-panko.yaml @@ -1,2 +1,4 @@ +# DEPRECATED. This file will be removed in the Stein release as it is no longer +# needed resource_registry: - OS::TripleO::Services::UndercloudPankoApi: ../../docker/services/panko-api.yaml + OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 9023f685ae..8826676e43 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -7,6 +7,27 @@ resource_registry: # Allows us to control the external VIP for Undercloud SSL OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_from_pool.yaml + # services we disable by default on the undercloud + OS::TripleO::Services::AodhApi: OS::Heat::None + OS::TripleO::Services::AodhEvaluator: OS::Heat::None + OS::TripleO::Services::AodhNotifier: OS::Heat::None + OS::TripleO::Services::AodhListener: OS::Heat::None + OS::TripleO::Services::CeilometerAgentCentral: OS::Heat::None + OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None + OS::TripleO::Services::CeilometerAgentIpmi: OS::Heat::None + OS::TripleO::Services::GnocchiApi: OS::Heat::None + OS::TripleO::Services::GnocchiMetricd: OS::Heat::None + OS::TripleO::Services::GnocchiStatsd: OS::Heat::None + OS::TripleO::Services::PankoApi: OS::Heat::None + OS::TripleO::Services::Redis: OS::Heat::None + OS::TripleO::Services::CinderApi: OS::Heat::None + OS::TripleO::Services::CinderScheduler: OS::Heat::None + OS::TripleO::Services::CinderVolume: OS::Heat::None + + # Undercloud HA services + OS::TripleO::Services::HAproxy: OS::Heat::None + OS::TripleO::Services::Keepalived: OS::Heat::None + parameter_defaults: # ensure we enable ip_forward before docker gets run KernelIpForward: 1 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index c4a130a90e..2df8f1a028 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -117,10 +117,6 @@ resource_registry: OS::TripleO::Services::CinderBackup: OS::Heat::None OS::TripleO::Services::CinderScheduler: docker/services/cinder-scheduler.yaml OS::TripleO::Services::CinderVolume: docker/services/cinder-volume.yaml - # undercloud cinder services - OS::TripleO::Services::UndercloudCinderApi: OS::Heat::None - OS::TripleO::Services::UndercloudCinderScheduler: OS::Heat::None - OS::TripleO::Services::UndercloudCinderVolume: OS::Heat::None OS::TripleO::Services::BlockStorageCinderVolume: docker/services/cinder-volume.yaml OS::TripleO::Services::Congress: OS::Heat::None OS::TripleO::Services::Keystone: docker/services/keystone.yaml @@ -225,25 +221,12 @@ resource_registry: OS::TripleO::Services::CeilometerAgentNotification: docker/services/ceilometer-agent-notification.yaml OS::TripleO::Services::ComputeCeilometerAgent: docker/services/ceilometer-agent-compute.yaml OS::TripleO::Services::Horizon: docker/services/horizon.yaml - # Undercloud Telemetry services - OS::TripleO::Services::UndercloudCeilometerAgentCentral: OS::Heat::None - OS::TripleO::Services::UndercloudCeilometerAgentNotification: OS::Heat::None - OS::TripleO::Services::UndercloudCeilometerAgentIpmi: OS::Heat::None - #Gnocchi services OS::TripleO::Services::GnocchiApi: docker/services/gnocchi-api.yaml OS::TripleO::Services::GnocchiMetricd: docker/services/gnocchi-metricd.yaml OS::TripleO::Services::GnocchiStatsd: docker/services/gnocchi-statsd.yaml - OS::TripleO::Services::UndercloudGnocchiApi: OS::Heat::None - OS::TripleO::Services::UndercloudGnocchiMetricd: OS::Heat::None - OS::TripleO::Services::UndercloudGnocchiStatsd: OS::Heat::None - # Redis - OS::TripleO::Services::UndercloudRedis: OS::Heat::None - # Undercloud HA services - OS::TripleO::Services::UndercloudHAProxy: OS::Heat::None - OS::TripleO::Services::UndercloudKeepalived: OS::Heat::None # Services that are disabled by default (use relevant environment files): OS::TripleO::Services::Fluentd: OS::Heat::None @@ -273,12 +256,7 @@ resource_registry: OS::TripleO::Services::AodhEvaluator: docker/services/aodh-evaluator.yaml OS::TripleO::Services::AodhListener: docker/services/aodh-listener.yaml OS::TripleO::Services::AodhNotifier: docker/services/aodh-notifier.yaml - OS::TripleO::Services::UndercloudAodhApi: OS::Heat::None - OS::TripleO::Services::UndercloudAodhEvaluator: OS::Heat::None - OS::TripleO::Services::UndercloudAodhNotifier: OS::Heat::None - OS::TripleO::Services::UndercloudAodhListener: OS::Heat::None OS::TripleO::Services::PankoApi: docker/services/panko-api.yaml - OS::TripleO::Services::UndercloudPankoApi: OS::Heat::None OS::TripleO::Services::MistralEngine: OS::Heat::None OS::TripleO::Services::MistralApi: OS::Heat::None OS::TripleO::Services::MistralExecutor: OS::Heat::None diff --git a/releasenotes/notes/remove-undercloud-specific-services-23046e607565d36d.yaml b/releasenotes/notes/remove-undercloud-specific-services-23046e607565d36d.yaml new file mode 100644 index 0000000000..60b5dc4cda --- /dev/null +++ b/releasenotes/notes/remove-undercloud-specific-services-23046e607565d36d.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + The environment/services/undercloud-*.yaml files will be removed in the Stein + release. These files relied on OS::TripleO::Services::Undercloud* services + that have been removed. diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index aaad4133e3..37ef2698a5 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -3,8 +3,8 @@ ############################################################################### - name: Undercloud description: | - EXPERIMENTAL. A role to deploy the undercloud via heat using the 'openstack - undercloud deploy' command. + A role to deploy the undercloud via heat using the 'openstack undercloud + deploy' command. CountDefault: 1 disable_constraints: True tags: @@ -12,39 +12,56 @@ - controller ServicesDefault: - OS::TripleO::Services::Aide + - OS::TripleO::Services::AodhApi + - OS::TripleO::Services::AodhEvaluator + - OS::TripleO::Services::AodhListener + - OS::TripleO::Services::AodhNotifier - OS::TripleO::Services::Apache - OS::TripleO::Services::BarbicanApi - - OS::TripleO::Services::BarbicanBackendSimpleCrypto - OS::TripleO::Services::BarbicanBackendDogtag - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto + - OS::TripleO::Services::BarbicanBackendSimpleCrypto - OS::TripleO::Services::CACerts + - OS::TripleO::Services::CeilometerAgentCentral + - OS::TripleO::Services::CeilometerAgentIpmi + - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CertmongerUser + - OS::TripleO::Services::CinderApi + - OS::TripleO::Services::CinderScheduler + - OS::TripleO::Services::CinderVolume + - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Docker - OS::TripleO::Services::DockerRegistry - OS::TripleO::Services::GlanceApi + - OS::TripleO::Services::GnocchiApi + - OS::TripleO::Services::GnocchiMetricd + - OS::TripleO::Services::GnocchiStatsd + - OS::TripleO::Services::HAproxy - OS::TripleO::Services::HeatApi - OS::TripleO::Services::HeatApiCfn - OS::TripleO::Services::HeatEngine - OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicConductor - OS::TripleO::Services::IronicInspector - - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::IronicNeutronAgent + - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::Iscsid + - OS::TripleO::Services::Keepalived - OS::TripleO::Services::Keystone - OS::TripleO::Services::LoginDefs + - OS::TripleO::Services::MasqueradeNetworks - OS::TripleO::Services::Memcached - OS::TripleO::Services::MistralApi - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - OS::TripleO::Services::MistralEventEngine + - OS::TripleO::Services::MistralExecutor - OS::TripleO::Services::MySQL - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronDhcpAgent - - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronL3Agent + - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaIronic @@ -53,35 +70,18 @@ - OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::Novajoin - OS::TripleO::Services::Ntp - - OS::TripleO::Services::ContainersLogrotateCrond - - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify + - OS::TripleO::Services::OsloMessagingRpc + - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - - OS::TripleO::Services::MasqueradeNetworks - OS::TripleO::Services::Sshd - OS::TripleO::Services::SwiftProxy - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage + - OS::TripleO::Services::Tempest - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoUI - OS::TripleO::Services::Tuned - - OS::TripleO::Services::UndercloudAodhApi - - OS::TripleO::Services::UndercloudAodhEvaluator - - OS::TripleO::Services::UndercloudAodhListener - - OS::TripleO::Services::UndercloudAodhNotifier - - OS::TripleO::Services::UndercloudCeilometerAgentCentral - - OS::TripleO::Services::UndercloudCeilometerAgentIpmi - - OS::TripleO::Services::UndercloudCeilometerAgentNotification - - OS::TripleO::Services::UndercloudGnocchiApi - - OS::TripleO::Services::UndercloudGnocchiMetricd - - OS::TripleO::Services::UndercloudGnocchiStatsd - - OS::TripleO::Services::UndercloudPankoApi - - OS::TripleO::Services::UndercloudCinderApi - - OS::TripleO::Services::UndercloudCinderScheduler - - OS::TripleO::Services::UndercloudCinderVolume - - OS::TripleO::Services::UndercloudRedis - - OS::TripleO::Services::UndercloudHAProxy - - OS::TripleO::Services::UndercloudKeepalived - OS::TripleO::Services::UndercloudUpgrade - OS::TripleO::Services::Zaqar - - OS::TripleO::Services::Tempest diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 710cbb0f9c..0574ac9315 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -6,8 +6,8 @@ ############################################################################### - name: Undercloud description: | - EXPERIMENTAL. A role to deploy the undercloud via heat using the 'openstack - undercloud deploy' command. + A role to deploy the undercloud via heat using the 'openstack undercloud + deploy' command. CountDefault: 1 disable_constraints: True tags: @@ -15,39 +15,56 @@ - controller ServicesDefault: - OS::TripleO::Services::Aide + - OS::TripleO::Services::AodhApi + - OS::TripleO::Services::AodhEvaluator + - OS::TripleO::Services::AodhListener + - OS::TripleO::Services::AodhNotifier - OS::TripleO::Services::Apache - OS::TripleO::Services::BarbicanApi - - OS::TripleO::Services::BarbicanBackendSimpleCrypto - OS::TripleO::Services::BarbicanBackendDogtag - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto + - OS::TripleO::Services::BarbicanBackendSimpleCrypto - OS::TripleO::Services::CACerts + - OS::TripleO::Services::CeilometerAgentCentral + - OS::TripleO::Services::CeilometerAgentIpmi + - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CertmongerUser + - OS::TripleO::Services::CinderApi + - OS::TripleO::Services::CinderScheduler + - OS::TripleO::Services::CinderVolume + - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Docker - OS::TripleO::Services::DockerRegistry - OS::TripleO::Services::GlanceApi + - OS::TripleO::Services::GnocchiApi + - OS::TripleO::Services::GnocchiMetricd + - OS::TripleO::Services::GnocchiStatsd + - OS::TripleO::Services::HAproxy - OS::TripleO::Services::HeatApi - OS::TripleO::Services::HeatApiCfn - OS::TripleO::Services::HeatEngine - OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicConductor - OS::TripleO::Services::IronicInspector - - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::IronicNeutronAgent + - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::Iscsid + - OS::TripleO::Services::Keepalived - OS::TripleO::Services::Keystone - OS::TripleO::Services::LoginDefs + - OS::TripleO::Services::MasqueradeNetworks - OS::TripleO::Services::Memcached - OS::TripleO::Services::MistralApi - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - OS::TripleO::Services::MistralEventEngine + - OS::TripleO::Services::MistralExecutor - OS::TripleO::Services::MySQL - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronDhcpAgent - - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronL3Agent + - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaIronic @@ -56,36 +73,19 @@ - OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::Novajoin - OS::TripleO::Services::Ntp - - OS::TripleO::Services::ContainersLogrotateCrond - - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify + - OS::TripleO::Services::OsloMessagingRpc + - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - - OS::TripleO::Services::MasqueradeNetworks - OS::TripleO::Services::Sshd - OS::TripleO::Services::SwiftProxy - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage + - OS::TripleO::Services::Tempest - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoUI - OS::TripleO::Services::Tuned - - OS::TripleO::Services::UndercloudAodhApi - - OS::TripleO::Services::UndercloudAodhEvaluator - - OS::TripleO::Services::UndercloudAodhListener - - OS::TripleO::Services::UndercloudAodhNotifier - - OS::TripleO::Services::UndercloudCeilometerAgentCentral - - OS::TripleO::Services::UndercloudCeilometerAgentIpmi - - OS::TripleO::Services::UndercloudCeilometerAgentNotification - - OS::TripleO::Services::UndercloudGnocchiApi - - OS::TripleO::Services::UndercloudGnocchiMetricd - - OS::TripleO::Services::UndercloudGnocchiStatsd - - OS::TripleO::Services::UndercloudPankoApi - - OS::TripleO::Services::UndercloudCinderApi - - OS::TripleO::Services::UndercloudCinderScheduler - - OS::TripleO::Services::UndercloudCinderVolume - - OS::TripleO::Services::UndercloudRedis - - OS::TripleO::Services::UndercloudHAProxy - - OS::TripleO::Services::UndercloudKeepalived - OS::TripleO::Services::UndercloudUpgrade - OS::TripleO::Services::Zaqar - - OS::TripleO::Services::Tempest