openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Revert "Revert "Switch off nova metadata api on the undercloud"""

Browse Source
This commit is contained in:
Zuul 2019-06-12 12:24:01 +00:00 committed by Gerrit Code Review
commit c9b209fa59
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
environments/undercloud.yaml
View File

@ -14,7 +14,6 @@ resource_registry:
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_from_pool.yaml OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_from_pool.yaml
OS::TripleO::Services::ComputeNeutronOvsAgent: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml OS::TripleO::Services::ComputeNeutronOvsAgent: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
OS::TripleO::Services::NeutronMetadataAgent: ../deployment/neutron/neutron-metadata-container-puppet.yaml
OS::TripleO::Services::NeutronOvsAgent: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml OS::TripleO::Services::NeutronOvsAgent: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml
OS::TripleO::Services::NeutronL3Agent: ../deployment/neutron/neutron-l3-container-puppet.yaml OS::TripleO::Services::NeutronL3Agent: ../deployment/neutron/neutron-l3-container-puppet.yaml
@ -39,6 +38,8 @@ resource_registry:
OS::TripleO::Services::CinderApi: OS::Heat::None OS::TripleO::Services::CinderApi: OS::Heat::None
OS::TripleO::Services::CinderScheduler: OS::Heat::None OS::TripleO::Services::CinderScheduler: OS::Heat::None
OS::TripleO::Services::CinderVolume: OS::Heat::None OS::TripleO::Services::CinderVolume: OS::Heat::None
OS::TripleO::Services::NovaMetadata: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
# Services we don't ever want configured. See LP#1824030 # Services we don't ever want configured. See LP#1824030
OS::TripleO::Services::Pacemaker: OS::Heat::None OS::TripleO::Services::Pacemaker: OS::Heat::None
@ -190,8 +191,7 @@ parameter_defaults:
MySQLServerOptions: MySQLServerOptions:
mysqld: mysqld:
connect_timeout: 60 connect_timeout: 60
NeutronMetadataProxySharedSecret: '' MetadataNATRule: false
MetadataNATRule: true
# TODO(emilien) Remove when Keepalived 2.0.6 is out # TODO(emilien) Remove when Keepalived 2.0.6 is out
# https://bugs.launchpad.net/tripleo/+bug/1791238 # https://bugs.launchpad.net/tripleo/+bug/1791238
KeepalivedRestart: true KeepalivedRestart: true

1
roles/Undercloud.yaml
View File

@ -70,7 +70,6 @@
- OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaApi
- OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaConductor
- OS::TripleO::Services::NovaIronic - OS::TripleO::Services::NovaIronic
- OS::TripleO::Services::NovaMetadata
- OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::NovaScheduler
- OS::TripleO::Services::Novajoin - OS::TripleO::Services::Novajoin
- OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OpenStackClients

1
roles_data_undercloud.yaml
View File

@ -73,7 +73,6 @@
- OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaApi
- OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaConductor
- OS::TripleO::Services::NovaIronic - OS::TripleO::Services::NovaIronic
- OS::TripleO::Services::NovaMetadata
- OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::NovaScheduler
- OS::TripleO::Services::Novajoin - OS::TripleO::Services::Novajoin
- OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OpenStackClients