Revert Add OvnDbInternal to EndpointMap and use it for ovn_db_host

We revert I0d9eb663405d1113ea84e3c12651a3f0dbdfc75d and we instead
export ovn_dbs_vip on all nodes so it can be used in cells. Reason for this
is that we want a separate VIP for OVN because a) composable roles and b)
we do not want to impose the extra promote master constraints on the internal_api
VIP which ends up being used by OVN.

In the same vein as I7ca94dff4acf0816708110b9fe6f78d19dcc7b4d
(Move redis_vip to all_nodes.j2) we will have the ovn_dbs_vip moved
to all nodes (via I1d80587752ffca6c3eb5281aa89ea3d7cf5535ce).

Depends-On: I1d80587752ffca6c3eb5281aa89ea3d7cf5535ce

Change-Id: I4e4bf0a91751fb4f9e4c7233242cdc5649c421f8
Related-Bug: #1841811

deployment/ovn/ovn-controller-container-puppet.yaml

@@ -123,7 +123,6 @@ outputs:
             ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
             ovn::controller::hostname: "%{hiera('fqdn_canonical')}"
             ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}
-            tripleo::profile::base::neutron::agents::ovn::ovn_db_host: {get_param: [EndpointMap, OvnDbInternal, host_nobrackets]}
             tripleo::ovn_controller::firewall_rules:
               '118 neutron vxlan networks':
                     proto: 'udp'

deployment/ovn/ovn-metadata-container-puppet.yaml

@@ -161,7 +161,6 @@ outputs:
             neutron::agents::ovn_metadata::metadata_host: {get_param: [EndpointMap, NovaMetadataCellInternal, host_nobrackets]}
             neutron::agents::ovn_metadata::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout}
             ovn::southbound::port: {get_param: OVNSouthboundServerPort}
-            tripleo::profile::base::neutron::ovn_metadata::ovn_db_host: {get_param: [EndpointMap, OvnDbInternal, host_nobrackets]}
             neutron::agents::ovn_metadata::debug:
                 if:
                 - service_debug_unset

environments/ssl/no-tls-endpoints-public-ip.yaml

@@ -90,7 +90,6 @@ parameter_defaults:
     OctaviaPublic: {protocol: http, port: '9876', host: IP_ADDRESS}
     OpenDaylightAdmin: {protocol: http, port: '8081', host: IP_ADDRESS}
     OpenDaylightInternal: {protocol: http, port: '8081', host: IP_ADDRESS}
-    OvnDbInternal: {protocol: tcp, port: '6642', host: IP_ADDRESS}
     SaharaAdmin: {protocol: http, port: '8386', host: IP_ADDRESS}
     SaharaInternal: {protocol: http, port: '8386', host: IP_ADDRESS}
     SaharaPublic: {protocol: http, port: '8386', host: IP_ADDRESS}

environments/ssl/tls-endpoints-public-dns.yaml

@@ -86,7 +86,6 @@ parameter_defaults:
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
     OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
     OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-    OvnDbInternal: {protocol: tcp, port: '6642', host: 'IP_ADDRESS'}
     SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}

environments/ssl/tls-endpoints-public-ip.yaml

@@ -86,7 +86,6 @@ parameter_defaults:
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
     OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
     OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-    OvnDbInternal: {protocol: tcp, port: '6642', host: 'IP_ADDRESS'}
     SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaPublic: {protocol: 'https', port: '13386', host: 'IP_ADDRESS'}

environments/ssl/tls-everywhere-endpoints-dns.yaml

@@ -86,7 +86,6 @@ parameter_defaults:
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
     OpenDaylightAdmin: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
     OpenDaylightInternal: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
-    OvnDbInternal: {protocol: tcp, port: '6642', host: 'IP_ADDRESS'}
     SaharaAdmin: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
     SaharaInternal: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
     SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}

network/endpoints/endpoint_data.yaml

@@ -88,12 +88,6 @@ Mysql:
     protocol: mysql+pymysql
     port: 3306
 
-OvnDb:
-    Internal:
-        net_param: OvnDbs
-    protocol: tcp
-    port: 6642
-
 Heat:
     Internal:
         net_param: HeatApi

network/endpoints/endpoint_map.yaml

@@ -303,10 +303,6 @@ parameters:
         protocol: http
         port: '8081'
         host: IP_ADDRESS
-      OvnDbInternal:
-        protocol: tcp
-        port: '6642'
-        host: IP_ADDRESS
       PlacementAdmin:
         protocol: http
         port: '8778'
@@ -11053,133 +11049,6 @@ outputs:
               - EndpointMap
               - OpenDaylightInternal
               - port
-      OvnDbInternal:
-        host:
-          str_replace:
-            template:
-              get_param:
-              - EndpointMap
-              - OvnDbInternal
-              - host
-            params:
-              CLOUDNAME:
-                get_param:
-                - CloudEndpoints
-                - get_param:
-                  - ServiceNetMap
-                  - OvnDbsNetwork
-              IP_ADDRESS:
-                get_param:
-                - NetIpMap
-                - str_replace:
-                    params:
-                      NETWORK:
-                        get_param:
-                        - ServiceNetMap
-                        - OvnDbsNetwork
-                    template: NETWORK_uri
-        host_nobrackets:
-          str_replace:
-            template:
-              get_param:
-              - EndpointMap
-              - OvnDbInternal
-              - host
-            params:
-              CLOUDNAME:
-                get_param:
-                - CloudEndpoints
-                - get_param:
-                  - ServiceNetMap
-                  - OvnDbsNetwork
-              IP_ADDRESS:
-                get_param:
-                - NetIpMap
-                - get_param:
-                  - ServiceNetMap
-                  - OvnDbsNetwork
-        port:
-          get_param:
-          - EndpointMap
-          - OvnDbInternal
-          - port
-        protocol:
-          get_param:
-          - EndpointMap
-          - OvnDbInternal
-          - protocol
-        uri:
-          make_url:
-            scheme:
-              get_param:
-              - EndpointMap
-              - OvnDbInternal
-              - protocol
-            host:
-              str_replace:
-                template:
-                  get_param:
-                  - EndpointMap
-                  - OvnDbInternal
-                  - host
-                params:
-                  CLOUDNAME:
-                    get_param:
-                    - CloudEndpoints
-                    - get_param:
-                      - ServiceNetMap
-                      - OvnDbsNetwork
-                  IP_ADDRESS:
-                    get_param:
-                    - NetIpMap
-                    - str_replace:
-                        params:
-                          NETWORK:
-                            get_param:
-                            - ServiceNetMap
-                            - OvnDbsNetwork
-                        template: NETWORK_uri
-            port:
-              get_param:
-              - EndpointMap
-              - OvnDbInternal
-              - port
-        uri_no_suffix:
-          make_url:
-            scheme:
-              get_param:
-              - EndpointMap
-              - OvnDbInternal
-              - protocol
-            host:
-              str_replace:
-                template:
-                  get_param:
-                  - EndpointMap
-                  - OvnDbInternal
-                  - host
-                params:
-                  CLOUDNAME:
-                    get_param:
-                    - CloudEndpoints
-                    - get_param:
-                      - ServiceNetMap
-                      - OvnDbsNetwork
-                  IP_ADDRESS:
-                    get_param:
-                    - NetIpMap
-                    - str_replace:
-                        params:
-                          NETWORK:
-                            get_param:
-                            - ServiceNetMap
-                            - OvnDbsNetwork
-                        template: NETWORK_uri
-            port:
-              get_param:
-              - EndpointMap
-              - OvnDbInternal
-              - port
       PlacementAdmin:
         host:
           str_replace:

releasenotes/notes/remove-ovndbinternal-endpoint-295f452c938aa06c.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    We revert I0d9eb663405d1113ea84e3c12651a3f0dbdfc75d and we instead
+    export ovn_dbs_vip on all nodes so it can be used in cells. Reason for this
+    is that we want a separate VIP for OVN because a) composable roles and b)
+    we do not want to impose the extra promote master constraints on the internal_api
+    VIP which ends up being used by OVN.

sample-env-generator/ssl.yaml

@@ -194,7 +194,6 @@ environments:
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
             OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
             OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            OvnDbInternal: {protocol: tcp, port: '6642', host: 'IP_ADDRESS'}
             SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaPublic: {protocol: 'https', port: '13386', host: 'IP_ADDRESS'}
@@ -304,7 +303,6 @@ environments:
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
             OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
             OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            OvnDbInternal: {protocol: tcp, port: '6642', host: 'IP_ADDRESS'}
             SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
@@ -414,7 +412,6 @@ environments:
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
             OpenDaylightAdmin: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
             OpenDaylightInternal: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
-            OvnDbInternal: {protocol: tcp, port: '6642', host: 'IP_ADDRESS'}
             SaharaAdmin: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
             SaharaInternal: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
             SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
@@ -534,7 +531,6 @@ environments:
             OctaviaPublic: {protocol: http, port: '9876', host: IP_ADDRESS}
             OpenDaylightAdmin: {protocol: http, port: '8081', host: IP_ADDRESS}
             OpenDaylightInternal: {protocol: http, port: '8081', host: IP_ADDRESS}
-            OvnDbInternal: {protocol: tcp, port: '6642', host: IP_ADDRESS}
             SaharaAdmin: {protocol: http, port: '8386', host: IP_ADDRESS}
             SaharaInternal: {protocol: http, port: '8386', host: IP_ADDRESS}
             SaharaPublic: {protocol: http, port: '8386', host: IP_ADDRESS}