From f1b1273f2b71ae131d408e659a7ae7dc22ed7dff Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 18 Dec 2019 22:36:23 +0000 Subject: [PATCH] Revert "Optional enable undercloud nova-metadata-api" There is no longer a need for stable/train to have a working nova-metadata-api This reverts commit 00cd4b0aea30f2975f58b2712047e8bd980f7004. Change-Id: I520b1104e0dff683834f5bed13a33858ce21abaf --- environments/undercloud-nova-metadata-api.yaml | 5 ----- .../notes/optional-nova-metadata-ed4262aa37bbf84c.yaml | 5 ----- roles/Undercloud.yaml | 1 - roles_data_undercloud.yaml | 1 - 4 files changed, 12 deletions(-) delete mode 100644 environments/undercloud-nova-metadata-api.yaml delete mode 100644 releasenotes/notes/optional-nova-metadata-ed4262aa37bbf84c.yaml diff --git a/environments/undercloud-nova-metadata-api.yaml b/environments/undercloud-nova-metadata-api.yaml deleted file mode 100644 index d7205a8549..0000000000 --- a/environments/undercloud-nova-metadata-api.yaml +++ /dev/null @@ -1,5 +0,0 @@ -resource_registry: - OS::TripleO::Services::NovaMetadata: ../deployment/nova/nova-metadata-container-puppet.yaml - -parameter_defaults: - MetadataNATRule: true \ No newline at end of file diff --git a/releasenotes/notes/optional-nova-metadata-ed4262aa37bbf84c.yaml b/releasenotes/notes/optional-nova-metadata-ed4262aa37bbf84c.yaml deleted file mode 100644 index 4cdd6d0599..0000000000 --- a/releasenotes/notes/optional-nova-metadata-ed4262aa37bbf84c.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -features: - - | - Add environment file environments/undercloud-nova-metadata-api.yaml to - optionally enable the nova-metadata-api in the undercloud diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index c8f726bb9d..2b3790414c 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -70,7 +70,6 @@ - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaIronic - - OS::TripleO::Services::NovaMetadata - OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::Novajoin - OS::TripleO::Services::OpenStackClients diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 1e37e3847c..c315f90ac8 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -73,7 +73,6 @@ - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaIronic - - OS::TripleO::Services::NovaMetadata - OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::Novajoin - OS::TripleO::Services::OpenStackClients