flatten database service MySQL Server

This change combines the previous puppet and docker files into a single
file that performs the docker service installation and configuration.

With this patch the baremetal version of database service MySQL Server
has been removed.

Change-Id: I407bd8d8fe9bde53609e4316b12eb0b7151552ca
Related-Blueprint: services-yaml-flattening

ci/environments/multinode-3nodes-registry.yaml

@@ -8,7 +8,7 @@ resource_registry:
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.

ci/environments/scenario000-multinode-containers.yaml

@@ -11,7 +11,7 @@ resource_registry:
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
 
 parameter_defaults:

ci/environments/scenario001-multinode-containers.yaml

@@ -15,7 +15,7 @@ resource_registry:
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
   OS::TripleO::Services::Redis: ../../docker/services/pacemaker/database/redis.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml
   OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None

ci/environments/scenario002-multinode-containers.yaml

@@ -12,7 +12,7 @@ resource_registry:
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml
   OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
   OS::TripleO::Services::BarbicanBackendSimpleCrypto: ../../deployment/barbican/barbican-backend-simple-crypto-puppet.yaml

ci/environments/scenario003-multinode-containers.yaml

@@ -13,12 +13,12 @@ resource_registry:
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
   OS::TripleO::Services::DesignateApi: ../../deployment/designate/designate-api-container-puppet.yaml
   OS::TripleO::Services::DesignateCentral: ../../deployment/designate/designate-central-container-puppet.yaml
   OS::TripleO::Services::DesignateProducer: ../../deployment/designate/designate-producer-container-puppet.yaml
   OS::TripleO::Services::DesignateWorker: ../../deployment/designate/designate-worker-container-puppet.yaml
   OS::TripleO::Services::DesignateMDNS: ../../deployment/designate/designate-mdns-container-puppet.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.

ci/environments/scenario004-multinode-containers.yaml

@@ -28,7 +28,7 @@ resource_registry:
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
   OS::TripleO::Services::Redis: ../../docker/services/pacemaker/database/redis.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.

ci/environments/scenario004-standalone.yaml

@@ -23,7 +23,7 @@ resource_registry:
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
   # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
   #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we

ci/environments/scenario010-multinode-containers.yaml

@@ -9,7 +9,7 @@ resource_registry:
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
   OS::TripleO::Services::OctaviaApi: ../../docker/services/octavia-api.yaml

ci/environments/scenario012-multinode-containers.yaml

@@ -12,7 +12,7 @@ resource_registry:
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml

ci/environments/scenario012-standalone.yaml

@@ -12,7 +12,7 @@ resource_registry:
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
-  OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml

deployment/database/mysql-base.yaml

@@ -169,27 +169,3 @@ outputs:
               network: {get_param: [ServiceNetMap, MysqlNetwork]}
               type: node
           - null
-      upgrade_tasks:
-        - name: Check for galera root password
-          when: step|int == 0
-          file: path=/root/.my.cnf state=file
-        - name: Stop service
-          when: step|int == 2
-          service: name=mariadb state=stopped
-        - name: Start service
-          when: step|int == 4
-          service: name=mariadb state=started
-        - name: Setup cell_v2 (create cell0 database)
-          when: step|int == 4
-          mysql_db:
-            name: nova_cell0
-            state: present
-            login_unix_socket: '/var/lib/mysql/mysql.sock'
-        - name: Setup cell_v2 (grant access to the nova DB user)
-          when: step|int == 4
-          mysql_user:
-            login_unix_socket: '/var/lib/mysql/mysql.sock'
-            str_replace:
-              template: "name=nova password=PASSWORD host=\"%\" priv=\"nova.*:ALL/nova_cell0.*:ALL,GRANT\" state=present"
-              params:
-                PASSWORD: {get_param: NovaPassword}

deployment/database/mysql-container-puppet.yaml

@@ -58,8 +58,8 @@ conditions:
 
 resources:
 
-  MysqlPuppetBase:
-    type: ../../../puppet/services/database/mysql.yaml
+  MysqlBase:
+    type: ./mysql-base.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}
@@ -72,10 +72,10 @@ outputs:
   role_data:
     description: Containerized service MySQL using composable services.
     value:
-      service_name: {get_attr: [MysqlPuppetBase, role_data, service_name]}
+      service_name: {get_attr: [MysqlBase, role_data, service_name]}
       config_settings:
         map_merge:
-          - {get_attr: [MysqlPuppetBase, role_data, config_settings]}
+          - {get_attr: [MysqlBase, role_data, config_settings]}
           # Set PID file to what kolla mariadb bootstrap script expects
           - tripleo::profile::base::database::mysql::mysql_server_options:
               yaql:
@@ -94,7 +94,7 @@ outputs:
           list_join:
             - "\n"
             - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
-              - {get_attr: [MysqlPuppetBase, role_data, step_config]}
+              - {get_attr: [MysqlBase, role_data, step_config]}
         config_image: &mysql_config_image {get_param: DockerMysqlConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mysql.json:
@@ -235,7 +235,7 @@ outputs:
                 - /etc/pki/tls/private/mysql.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/mysql.key:ro
               - null
       metadata_settings:
-        get_attr: [MysqlPuppetBase, role_data, metadata_settings]
+        get_attr: [MysqlBase, role_data, metadata_settings]
       host_prep_tasks:
         - name: create persistent directories
           file:

deployment/database/mysql-pacemaker-puppet.yaml

@@ -82,10 +82,10 @@ parameters:
 resources:
 
   ContainersCommon:
-    type: ../../containers-common.yaml
+    type: ../../docker/services/containers-common.yaml
 
-  MysqlPuppetBase:
-    type: ../../../../puppet/services/pacemaker/database/mysql.yaml
+  MysqlBase:
+    type: ./mysql-base.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}
@@ -102,11 +102,31 @@ outputs:
   role_data:
     description: Containerized service MySQL using composable services.
     value:
-      service_name: {get_attr: [MysqlPuppetBase, role_data, service_name]}
+      service_name: {get_attr: [MysqlBase, role_data, service_name]}
       config_settings:
         map_merge:
-          - {get_attr: [MysqlPuppetBase, role_data, config_settings]}
-          - tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image: &mysql_image_pcmklatest
+          - get_attr: [MysqlBase, role_data, config_settings]
+          - tripleo::profile::pacemaker::database::mysql::bind_address:
+              str_replace:
+                template:
+                  "%{hiera('fqdn_$NETWORK')}"
+                params:
+                  $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
+            # NOTE: bind IP is found in hiera replacing the network name with the
+            # local node IP for the given network; replacement examples
+            # (eg. for internal_api):
+            # internal_api -> IP
+            # internal_api_uri -> [IP]
+            # internal_api_subnet - > IP/CIDR
+            tripleo::profile::pacemaker::database::mysql::gmcast_listen_addr:
+              str_replace:
+                template:
+                  "%{hiera('$NETWORK')}"
+                params:
+                  $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
+            tripleo::profile::pacemaker::database::mysql::ca_file:
+              get_param: InternalTLSCAFile
+            tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image: &mysql_image_pcmklatest
               list_join:
                 - ':'
                 - - yaql:
@@ -311,7 +331,7 @@ outputs:
               /var/log/containers/mysql.
           ignore_errors: true
       metadata_settings:
-        get_attr: [MysqlPuppetBase, role_data, metadata_settings]
+        get_attr: [MysqlBase, role_data, metadata_settings]
       deploy_steps_tasks:
         - name: MySQL tag container image for pacemaker
           when: step|int == 1

docker/services/pacemaker/clustercheck.yaml

@@ -48,7 +48,7 @@ resources:
 # rewriting the tripleo::mysql::firewall_rules key with the baremetal firewall
 # rules (see LP#1728918)
   MysqlPuppetBase:
-    type: ../../../docker/services/pacemaker/database/mysql.yaml
+    type: ../../../deployment/database/mysql-pacemaker-puppet.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

environments/baremetal-services.yaml

@@ -29,8 +29,8 @@ resource_registry:
   OS::TripleO::Services::Keystone: ../deployment/keystone/keystone-container-puppet.yaml
   OS::TripleO::Services::Memcached: ../deployment/memcached/memcached-container-puppet.yaml
   OS::TripleO::Services::Multipathd: OS::Heat::None
-  OS::TripleO::Services::MySQL: ../puppet/services/database/mysql.yaml
   OS::TripleO::Services::NeutronApi:  ../deployment/neutron/neutron-api-container-puppet.yaml
+  OS::TripleO::Services::MySQL: ../deployment/database/mysql-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/neutron-plugin-ml2.yaml
   OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml
   OS::TripleO::Services::NeutronL3Agent: ../deployment/neutron/neutron-l3-container-puppet.yaml

environments/docker-ha.yaml

@@ -17,7 +17,7 @@ resource_registry:
   OS::TripleO::Services::CinderVolume: ../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../docker/services/pacemaker/clustercheck.yaml
   OS::TripleO::Services::HAproxy: ../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::MySQL: ../docker/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingRpc: ../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::Redis: ../docker/services/pacemaker/database/redis.yaml

environments/docker-uc-light.yaml

@@ -15,7 +15,7 @@ resource_registry:
   OS::TripleO::Services::MistralApi: ../deployment/mistral/mistral-api-container-puppet.yaml
   OS::TripleO::Services::MistralEngine: ../deployment/mistral/mistral-engine-container-puppet.yaml
   OS::TripleO::Services::MistralExecutor: ../deployment/mistral/mistral-executor-container-puppet.yaml
-  OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../deployment/database/mysql-container-puppet.yaml
   OS::TripleO::Services::NeutronApi: ../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml
   OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml

environments/nonha-arch.yaml

@@ -5,7 +5,7 @@ resource_registry:
   OS::TripleO::Services::RabbitMQ: ../deployment/rabbitmq/rabbitmq-container-puppet.yaml
   OS::TripleO::Services::HAproxy: ../deployment/haproxy/haproxy-container-puppet.yaml
   OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml
-  OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
+  OS::TripleO::Services::MySQL: ../deployment/database/mysql-container-puppet.yaml
   OS::TripleO::Services::Keepalived: ../docker/services/keepalived.yaml
   OS::TripleO::Services::Pacemaker: OS::Heat::None
   OS::TripleO::Services::PacemakerRemote: OS::Heat::None

overcloud-resource-registry-puppet.j2.yaml

@@ -130,7 +130,7 @@ resource_registry:
   OS::TripleO::Services::Kernel: deployment/kernel/kernel-baremetal-puppet.yaml
   OS::TripleO::Services::Kubernetes::Master: extraconfig/services/kubernetes-master.yaml
   OS::TripleO::Services::Kubernetes::Worker: extraconfig/services/kubernetes-worker.yaml
-  OS::TripleO::Services::MySQL: docker/services/database/mysql.yaml
+  OS::TripleO::Services::MySQL: deployment/database/mysql-container-puppet.yaml
   OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
   OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
   OS::TripleO::Services::NeutronSfcApi: OS::Heat::None

puppet/services/pacemaker/database/mysql.yaml

@@ -1,87 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  MySQL with Pacemaker service deployment using puppet
-
-parameters:
-  #Parameters not used EndpointMap
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  InternalTLSCAFile:
-    default: '/etc/ipa/ca.crt'
-    type: string
-    description: Specifies the default CA cert to use if TLS is used for
-                 services in the internal network.
-
-resources:
-
-  MysqlBase:
-    type: ../../database/mysql.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-
-outputs:
-  role_data:
-    description: Service MySQL with Pacemaker using composable services.
-    value:
-      service_name: mysql
-      config_settings:
-        map_merge:
-          - get_attr: [MysqlBase, role_data, config_settings]
-          - tripleo::profile::pacemaker::database::mysql::bind_address:
-              str_replace:
-                template:
-                  "%{hiera('fqdn_$NETWORK')}"
-                params:
-                  $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
-            # NOTE: bind IP is found in hiera replacing the network name with the
-            # local node IP for the given network; replacement examples
-            # (eg. for internal_api):
-            # internal_api -> IP
-            # internal_api_uri -> [IP]
-            # internal_api_subnet - > IP/CIDR
-            tripleo::profile::pacemaker::database::mysql::gmcast_listen_addr:
-              str_replace:
-                template:
-                  "%{hiera('$NETWORK')}"
-                params:
-                  $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
-            tripleo::profile::pacemaker::database::mysql::ca_file:
-              get_param: InternalTLSCAFile
-      step_config: |
-        include ::tripleo::profile::pacemaker::database::mysql
-      metadata_settings:
-        get_attr: [MysqlBase, role_data, metadata_settings]
-      upgrade_tasks:
-        - name: Check for galera root password
-          when: step|int == 0
-          file: path=/root/.my.cnf state=file

releasenotes/notes/drop-baremetal-mysql-server-a36a2f39f88c8181.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Installing MySQL Server services on baremetal is no longer supported.