Skip to content

Commit 28a675d

Browse files
committed
Switch off nova metadata api on the undercloud
All known consumers of boot data (os-collect-config, etc) have a preference for using config-drive as the data source. The last known consumer was novajoin, but that switched to preferring config-drive early in the Stein development cycle[1] so it should now be safe to switch off the nova metadata API service. [1] https://review.opendev.org/#/c/607492/ Blueprint: nova-less-deploy Change-Id: If35aec24f446769fca7897c2126fb6657454f073
1 parent cf553f9 commit 28a675d

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

environments/undercloud.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ resource_registry:
1414
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_from_pool.yaml
1515

1616
OS::TripleO::Services::ComputeNeutronOvsAgent: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
17-
OS::TripleO::Services::NeutronMetadataAgent: ../deployment/neutron/neutron-metadata-container-puppet.yaml
1817
OS::TripleO::Services::NeutronOvsAgent: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
1918
OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml
2019
OS::TripleO::Services::NeutronL3Agent: ../deployment/neutron/neutron-l3-container-puppet.yaml
@@ -39,6 +38,8 @@ resource_registry:
3938
OS::TripleO::Services::CinderApi: OS::Heat::None
4039
OS::TripleO::Services::CinderScheduler: OS::Heat::None
4140
OS::TripleO::Services::CinderVolume: OS::Heat::None
41+
OS::TripleO::Services::NovaMetadata: OS::Heat::None
42+
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
4243

4344
# Services we don't ever want configured. See LP#1824030
4445
OS::TripleO::Services::Pacemaker: OS::Heat::None
@@ -191,8 +192,7 @@ parameter_defaults:
191192
MySQLServerOptions:
192193
mysqld:
193194
connect_timeout: 60
194-
NeutronMetadataProxySharedSecret: ''
195-
MetadataNATRule: true
195+
MetadataNATRule: false
196196
# TODO(emilien) Remove when Keepalived 2.0.6 is out
197197
# https://bugs.launchpad.net/tripleo/+bug/1791238
198198
KeepalivedRestart: true

roles/Undercloud.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
- OS::TripleO::Services::NovaApi
7171
- OS::TripleO::Services::NovaConductor
7272
- OS::TripleO::Services::NovaIronic
73-
- OS::TripleO::Services::NovaMetadata
7473
- OS::TripleO::Services::NovaScheduler
7574
- OS::TripleO::Services::Novajoin
7675
- OS::TripleO::Services::OpenStackClients

roles_data_undercloud.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
- OS::TripleO::Services::NovaApi
7474
- OS::TripleO::Services::NovaConductor
7575
- OS::TripleO::Services::NovaIronic
76-
- OS::TripleO::Services::NovaMetadata
7776
- OS::TripleO::Services::NovaScheduler
7877
- OS::TripleO::Services::Novajoin
7978
- OS::TripleO::Services::OpenStackClients

0 commit comments

Comments
 (0)