Fix TLS when using a containerized undercloud

Since we moved to containerized UC, TLS Everywhere deployments are broken. Namely we miss two things: A. The NAT iptables rule for the nova metadata service to be reachable B. The setting 'service_metadata_proxy=false' needs to be set for nova metadata otherwise the curl calls to setup ipa will fail with the following: [root@overcloud-controller-0 log]# curl http://169.254.169.254/openstack/2016-10-06 <html> <head> <title>400 Bad Request</title> </head> <body> <h1>400 Bad Request</h1> X-Instance-ID header is missing from request.<br /><br /> </body> </html> A. Is fixed by adding a conditional iptables rule that is only triggered when deploying an undercloud (where we set MetadataNATRule to true) B. Is fixed by setting NeutronMetadataProxySharedSecret to '' on the undercloud and then setting the corresponding hiera keys only when the parameter != ''. We tried alternative simpler approaches like setting NeutronMetadataProxySharedSecret to null but that will break heat as the parameter is required and setting it to null breaks heat validation (we also tried to make the parameter optional with a default: '', but that broke as well) While we're at it we also remove the neutron metadata service from the undercloud as it is not needed. Tested by deploying an undercloud with this change and observing: A. Chain PREROUTING (policy ACCEPT 106 packets, 6698 bytes) pkts bytes target prot opt in out source destination 0 0 REDIRECT tcp -- br-ctlplane * 0.0.0.0/0 169.254.169.254 multiport dports 80 state NEW /* 999 undercloud nat ipv4 */ redir ports 8775 B. grep -ir ^service_metadata_proxy /var/lib/config-data/puppet-generated/nova/etc/nova/nova.conf service_metadata_proxy=False Also a deployment of a TLS overcloud was successful. Change-Id: Id48df6db012fb433f9a0e618d0269196f4cfc2c6 Co-Authored-By: Martin Schuppert <mschuppe@redhat.com> Closes-Bug: #1795722 (cherry picked from commit c2139a7db2)
2018-10-02 20:49:29 +02:00 · 2018-10-02 20:49:29 +02:00 · ca765f73c6
parent a8b2ed5b63
commit ca765f73c6
7 changed files with 40 additions and 7 deletions
--- a/docker/services/nova-metadata.yaml
+++ b/docker/services/nova-metadata.yaml
@ -44,10 +44,14 @@ parameters:
  EnableInternalTLS:
    type: boolean
    default: false
+  MetadataNATRule:
+    default: false
+    description: When true we create the NAT rule for the metadata service
+    type: boolean

 conditions:
-
  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
+  need_metadata_nat_rule: {equals: [{get_param: MetadataNATRule}, true]}

 resources:

@ -80,6 +84,20 @@ outputs:
          - get_attr: [NovaMetadataBase, role_data, config_settings]
          - get_attr: [NovaMetadataLogging, config_settings]
          - apache::default_vhost: false
+          - tripleo.nova_metadata.firewall_rules:
+              if:
+              - need_metadata_nat_rule
+              - '144 undercloud metadata nat':
+                  dport: 80
+                  proto: 'tcp'
+                  table: 'nat'
+                  chain: 'PREROUTING'
+                  jump: 'REDIRECT'
+                  iniface: 'br-ctlplane'
+                  destination: '169.254.169.254/32'
+                  extras:
+                    toports: 8775
+              - {}
      logging_source: {get_attr: [NovaMetadataBase, role_data, logging_source]}
      logging_groups: {get_attr: [NovaMetadataBase, role_data, logging_groups]}
      service_config_settings:
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@ -141,3 +141,5 @@ parameter_defaults:
      connect_timeout: 60
  MistralExecutorExtraVolumes:
    - /usr/share/ceph-ansible:/usr/share/ceph-ansible:ro
+  NeutronMetadataProxySharedSecret: ''
+  MetadataNATRule: true
--- a/puppet/services/neutron-metadata.yaml
+++ b/puppet/services/neutron-metadata.yaml
@ -75,6 +75,7 @@ conditions:
  neutron_workers_unset: {equals : [{get_param: NeutronWorkers}, '']}
  service_debug_unset: {equals: [{get_param: NeutronMetadataAgentDebug}, '']}
  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
+  is_neutron_shared_metadata_notempty: {not: {equals: [{get_param: NeutronMetadataProxySharedSecret}, '']}}

 resources:

@ -97,8 +98,7 @@ outputs:
      config_settings:
        map_merge:
          - get_attr: [NeutronBase, role_data, config_settings]
-          - neutron::agents::metadata::shared_secret: {get_param: NeutronMetadataProxySharedSecret}
-            neutron::agents::metadata::auth_password: {get_param: NeutronPassword}
+          - neutron::agents::metadata::auth_password: {get_param: NeutronPassword}
            neutron::agents::metadata::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
            neutron::agents::metadata::auth_tenant: 'service'
            neutron::agents::metadata::debug:
@ -123,6 +123,11 @@ outputs:
            - neutron_workers_unset
            - {}
            - neutron::agents::metadata::metadata_workers: {get_param: NeutronWorkers}
+          -
+            if:
+            - is_neutron_shared_metadata_notempty
+            - neutron::agents::metadata::shared_secret: {get_param: NeutronMetadataProxySharedSecret}
+            - {}
      service_config_settings:
        fluentd:
          tripleo_fluentd_groups_neutron_metadata:
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@ -113,6 +113,7 @@ parameters:

 conditions:
  nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
+  is_neutron_shared_metadata_notempty: {not: {equals: [{get_param: NeutronMetadataProxySharedSecret}, '']}}

 resources:
  ApacheServiceBase:
@ -190,7 +191,6 @@ outputs:
                "%{hiera('fqdn_$NETWORK')}"
              params:
                $NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
-          nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
          nova::api::instance_name_template: {get_param: InstanceNameTemplate}
          nova_enable_db_purge: {get_param: NovaEnableDBPurge}
          nova::cron::archive_deleted_rows::minute: {get_param: NovaCronDBArchivedMinute}
@ -206,6 +206,11 @@ outputs:
          - {}
          - nova::api::osapi_compute_workers: {get_param: NovaWorkers}
            nova::wsgi::apache_api::workers: {get_param: NovaWorkers}
+        -
+          if:
+          - is_neutron_shared_metadata_notempty
+          - nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
+          - {}
      step_config: |
        include tripleo::profile::base::nova::api
      service_config_settings:
--- a/puppet/services/nova-metadata.yaml
+++ b/puppet/services/nova-metadata.yaml
@ -60,6 +60,7 @@ parameters:

 conditions:
  nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
+  is_neutron_shared_metadata_notempty: {not: {equals: [{get_param: NeutronMetadataProxySharedSecret}, '']}}

 resources:
  ApacheServiceBase:
@ -101,7 +102,6 @@ outputs:
          nova::keystone::authtoken::password: {get_param: NovaPassword}
          nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
          nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
-          nova::metadata::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
          nova::metadata::enable_proxy_headers_parsing: true
          nova_metadata_wsgi_enabled: true
          nova::wsgi::apache_metadata::api_port: '8775'
@ -128,6 +128,11 @@ outputs:
          - nova_workers_zero
          - {}
          - nova::wsgi::apache_metadata::workers: {get_param: NovaWorkers}
+        -
+          if:
+          - is_neutron_shared_metadata_notempty
+          - nova::metadata::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
+          - {}
      step_config: |
        include tripleo::profile::base::nova::metadata
      service_config_settings:
--- a/roles/Undercloud.yaml
+++ b/roles/Undercloud.yaml
@ -63,7 +63,6 @@
    - OS::TripleO::Services::NeutronCorePlugin
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronMetadataAgent
    - OS::TripleO::Services::NeutronOvsAgent
    - OS::TripleO::Services::NovaApi
    - OS::TripleO::Services::NovaConductor
--- a/roles_data_undercloud.yaml
+++ b/roles_data_undercloud.yaml
@ -66,7 +66,6 @@
    - OS::TripleO::Services::NeutronCorePlugin
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronMetadataAgent
    - OS::TripleO::Services::NeutronOvsAgent
    - OS::TripleO::Services::NovaApi
    - OS::TripleO::Services::NovaConductor