4 files changed, 0 insertions, 56 deletions
diff --git a/puppet/extraconfig/tls/no-ca.yaml b/puppet/extraconfig/tls/no-ca.yaml
deleted file mode 100644
index 5862a85c..00000000
--- a/puppet/extraconfig/tls/no-ca.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: >
-  This is a default no-op template which can be passed to the
-  OS::Nova::Server resources. This template can be replaced with
-  a different implementation via the resource registry, such that
-  deployers may customize their configuration.
-
-parameters:
-  server:    # Here for compatibility with controller.yaml
-    description: ID of the controller node to apply this config to
-    type: string
-
-outputs:
-  deploy_stdout:
-    description: Deployment reference, used to trigger puppet apply on changes
-    value: 'Root CA cert injection not enabled.'
diff --git a/puppet/extraconfig/tls/no-tls.yaml b/puppet/extraconfig/tls/no-tls.yaml
deleted file mode 100644
index a2b5c569..00000000
--- a/puppet/extraconfig/tls/no-tls.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: >
-  This is a default no-op template. This defines the parameters that
-  need to be passed in order to have TLS enabled in the controller
-  nodes. This template can be replaced with a different
-  implementation via the resource registry, such that deployers
-  may customize their configuration.
-
-parameters:
-  DeployedSSLCertificatePath:
-    default: ''
-    description: >
-        The filepath of the certificate as it will be stored in the controller.
-    type: string
-  NodeIndex: # Here for compatibility with puppet/controller.yaml
-    default: 0
-    type: number
-  server:    # Here for compatibility with puppet/controller.yaml
-    description: ID of the controller node to apply this config to
-    type: string
-
-outputs:
-  deploy_stdout:
-    description: Deployment reference, used to trigger puppet apply on changes
-    value: 'TLS not enabled.'
-  deployed_ssl_certificate_path:
-    value: ''
-  key_modulus_md5:
-    description: Key SSL Modulus
-    value: ''
-  cert_modulus_md5:
-    description: Certificate SSL Modulus
-    value: ''
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 0f769150..872e7c88 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -160,7 +160,6 @@ if hiera('step') >= 4 {
   }
   include ::nova::config
   include ::nova::api
-  include ::nova::cert
   include ::nova::consoleauth
   include ::nova::network::neutron
   include ::nova::vncproxy
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 0e2112c9..ee513a0d 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -377,10 +377,6 @@ MYSQL_HOST=localhost\n",
     manage_service => false,
     enabled        => false,
   }
-  class { '::nova::cert' :
-    manage_service => false,
-    enabled        => false,
-  }
   class { '::nova::consoleauth' :
     manage_service => false,
     enabled        => false,