Merge "Make the DB URIs host-independent for all services"

2017-02-20 18:29:47 +00:00 · 2017-02-20 18:29:47 +00:00 · 435d270986
commit 435d270986
parent d5b0c38f0b 90431683b5
32 changed files with 65 additions and 43 deletions
--- a/ci/environments/multinode-3nodes.yaml
+++ b/ci/environments/multinode-3nodes.yaml
@ -65,6 +65,7 @@
    - OS::TripleO::Services::Core
    - OS::TripleO::Services::Kernel
    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::RabbitMQ
    - OS::TripleO::Services::HAproxy
    - OS::TripleO::Services::Keepalived
--- a/ci/environments/multinode.yaml
+++ b/ci/environments/multinode.yaml
@ -15,6 +15,7 @@ parameter_defaults:
    - OS::TripleO::Services::HeatApiCloudwatch
    - OS::TripleO::Services::HeatEngine
    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL3Agent
    - OS::TripleO::Services::NeutronMetadataAgent
--- a/ci/environments/multinode_major_upgrade.yaml
+++ b/ci/environments/multinode_major_upgrade.yaml
@ -28,6 +28,7 @@ parameter_defaults:
    - OS::TripleO::Services::SaharaApi
    - OS::TripleO::Services::SaharaEngine
    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::RabbitMQ
    - OS::TripleO::Services::HAproxy
    - OS::TripleO::Services::Keepalived
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@ -19,6 +19,7 @@ parameter_defaults:
    - OS::TripleO::Services::HeatApiCloudwatch
    - OS::TripleO::Services::HeatEngine
    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL3Agent
    - OS::TripleO::Services::NeutronMetadataAgent
--- a/ci/environments/scenario002-multinode.yaml
+++ b/ci/environments/scenario002-multinode.yaml
@ -15,6 +15,7 @@ parameter_defaults:
    - OS::TripleO::Services::HeatApiCloudwatch
    - OS::TripleO::Services::HeatEngine
    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL3Agent
    - OS::TripleO::Services::NeutronMetadataAgent
--- a/ci/environments/scenario003-multinode.yaml
+++ b/ci/environments/scenario003-multinode.yaml
@ -17,6 +17,7 @@ parameter_defaults:
    - OS::TripleO::Services::HeatApiCloudwatch
    - OS::TripleO::Services::HeatEngine
    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL3Agent
    - OS::TripleO::Services::NeutronMetadataAgent
--- a/ci/environments/scenario004-multinode.yaml
+++ b/ci/environments/scenario004-multinode.yaml
@ -38,6 +38,7 @@ parameter_defaults:
    - OS::TripleO::Services::HeatApiCloudwatch
    - OS::TripleO::Services::HeatEngine
    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL3Agent
    - OS::TripleO::Services::NeutronMetadataAgent
--- a/deployed-server/deployed-server-roles-data.yaml
+++ b/deployed-server/deployed-server-roles-data.yaml
@ -41,6 +41,7 @@
    - OS::TripleO::Services::HeatApiCloudwatch
    - OS::TripleO::Services::HeatEngine
    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL3Agent
    - OS::TripleO::Services::NeutronMetadataAgent
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@ -245,6 +245,7 @@ resource_registry:
  OS::TripleO::Services::OctaviaHealthManager: OS::Heat::None
  OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None
  OS::TripleO::Services::OctaviaWorker: OS::Heat::None
+  OS::TripleO::Services::MySQLClient: puppet/services/database/mysql-client.yaml

 parameter_defaults:
  EnablePackageInstall: false
--- a/puppet/services/aodh-base.yaml
+++ b/puppet/services/aodh-base.yaml
@ -69,8 +69,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/aodh'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        aodh::debug: {get_param: Debug}
        aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
        aodh::rabbit_userid: {get_param: RabbitUserName}
--- a/puppet/services/barbican-api.yaml
+++ b/puppet/services/barbican-api.yaml
@ -105,8 +105,7 @@ outputs:
                  - '@'
                  - {get_param: [EndpointMap, MysqlInternal, host]}
                  - '/barbican'
-                  - '?bind_address='
-                  - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+                  - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
            tripleo.barbican_api.firewall_rules:
              '117 barbican':
                dport:
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@ -93,8 +93,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/ceilometer'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        ceilometer_backend: {get_param: CeilometerBackend}
        # we include db_sync class in puppet-tripleo
        ceilometer::db::sync_db: false
--- a/puppet/services/cinder-base.yaml
+++ b/puppet/services/cinder-base.yaml
@ -100,8 +100,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/cinder'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        cinder::debug: {get_param: Debug}
        cinder::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
        cinder::rabbit_userid: {get_param: RabbitUserName}
--- a/puppet/services/congress.yaml
+++ b/puppet/services/congress.yaml
@ -64,8 +64,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/congress'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        congress::keystone::auth::tenant: 'service'
        congress::keystone::auth::password: {get_param: CongressPassword}
        congress::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
--- a/puppet/services/database/mysql-client.yaml
+++ b/puppet/services/database/mysql-client.yaml
@ -0,0 +1,30 @@
+heat_template_version: ocata
+
+description: >
+  Mysql client settings
+
+parameters:
+  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
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+outputs:
+  role_data:
+    description: Role for setting mysql client parameters
+    value:
+      service_name: mysql_client
+      config_settings:
+        tripleo::profile::base:database::mysql::client_bind_address: {get_param: [ServiceNetMap, MysqlNetwork]}
+      step_config: |
+        include ::tripleo::profile::base::database::mysql::client
--- a/puppet/services/ec2-api.yaml
+++ b/puppet/services/ec2-api.yaml
@ -90,8 +90,7 @@ outputs:
                - '@'
                - {get_param: [EndpointMap, MysqlInternal, host]}
                - '/ec2_api'
-                - '?bind_address='
-                - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+                - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        -
          if:
          - nova_workers_zero
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@ -91,8 +91,7 @@ outputs:
                  - '@'
                  - {get_param: [EndpointMap, MysqlInternal, host]}
                  - '/glance'
-                  - '?bind_address='
-                  - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+                  - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
            glance::api::bind_port: {get_param: [EndpointMap, GlanceInternal, port]}
            glance::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
            glance::api::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@ -67,8 +67,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/gnocchi'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        gnocchi::db::sync::extra_opts: '--skip-storage'
        gnocchi::storage::swift::swift_user: 'service:gnocchi'
        gnocchi::storage::swift::swift_auth_version: 2
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@ -111,8 +111,7 @@ outputs:
                  - '@'
                  - {get_param: [EndpointMap, MysqlInternal, host]}
                  - '/heat'
-                  - '?bind_address='
-                  - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+                  - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
            heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
            heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
            heat::engine::auth_encryption_key:
--- a/puppet/services/ironic-base.yaml
+++ b/puppet/services/ironic-base.yaml
@ -60,8 +60,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/ironic'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        ironic::debug: {get_param: Debug}
        ironic::rabbit_userid: {get_param: RabbitUserName}
        ironic::rabbit_password: {get_param: RabbitPassword}
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@ -193,8 +193,7 @@ outputs:
                  - '@'
                  - {get_param: [EndpointMap, MysqlInternal, host]}
                  - '/keystone'
-                  - '?bind_address='
-                  - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+                  - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
            keystone::admin_token: {get_param: AdminToken}
            keystone::admin_password: {get_param: AdminPassword}
            keystone::roles::admin::password: {get_param: AdminPassword}
--- a/puppet/services/manila-base.yaml
+++ b/puppet/services/manila-base.yaml
@ -67,8 +67,7 @@ outputs:
            - '@'
            - {get_param: [EndpointMap, MysqlInternal, host]}
            - '/manila'
-            - '?bind_address='
-            - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+            - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
      service_config_settings:
        mysql:
          manila::db::mysql::password: {get_param: ManilaPassword}
--- a/puppet/services/mistral-base.yaml
+++ b/puppet/services/mistral-base.yaml
@ -65,8 +65,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/mistral'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        mistral::rabbit_userid: {get_param: RabbitUserName}
        mistral::rabbit_password: {get_param: RabbitPassword}
        mistral::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@ -127,8 +127,7 @@ outputs:
                  - '@'
                  - {get_param: [EndpointMap, MysqlInternal, host]}
                  - '/ovs_neutron'
-                  - '?bind_address='
-                  - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+                  - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
            neutron::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
            neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
            neutron::server::api_workers: {get_param: NeutronWorkers}
--- a/puppet/services/neutron-plugin-plumgrid.yaml
+++ b/puppet/services/neutron-plugin-plumgrid.yaml
@ -100,8 +100,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/ovs_neutron'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        neutron::plugins::plumgrid::controller_priv_host: {get_param: [EndpointMap, KeystoneInternal, host]}
        neutron::plugins::plumgrid::admin_password: {get_param: AdminPassword}
        neutron::plugins::plumgrid::metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@ -150,6 +150,7 @@ outputs:
                - '@'
                - {get_param: [EndpointMap, MysqlInternal, host]}
                - '/nova'
+                - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
          nova::api_database_connection:
            list_join:
              - ''
@ -159,6 +160,7 @@ outputs:
                - '@'
                - {get_param: [EndpointMap, MysqlInternal, host]}
                - '/nova_api'
+                - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
          nova::placement_database_connection:
            list_join:
              - ''
@ -168,6 +170,7 @@ outputs:
                - '@'
                - {get_param: [EndpointMap, MysqlInternal, host]}
                - '/nova_placement'
+                - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
          nova::debug: {get_param: Debug}
          nova::purge_config: {get_param: EnableConfigPurge}
          nova::network::neutron::neutron_project_name: 'service'
--- a/puppet/services/octavia-api.yaml
+++ b/puppet/services/octavia-api.yaml
@ -66,8 +66,7 @@ outputs:
                  - '@'
                  - {get_param: [EndpointMap, MysqlInternal, host]}
                  - '/octavia'
-                  - '?bind_address='
-                  - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+                  - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
            octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
            octavia::keystone::authtoken::project_name: 'service'
            octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
--- a/puppet/services/panko-base.yaml
+++ b/puppet/services/panko-base.yaml
@ -46,8 +46,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/panko'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        panko::debug: {get_param: Debug}
        panko::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
        panko::keystone::authtoken::project_name: 'service'
--- a/puppet/services/sahara-base.yaml
+++ b/puppet/services/sahara-base.yaml
@ -64,8 +64,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/sahara'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
        sahara::rabbit_password: {get_param: RabbitPassword}
        sahara::rabbit_user: {get_param: RabbitUserName}
        sahara::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
--- a/puppet/services/tacker.yaml
+++ b/puppet/services/tacker.yaml
@ -64,8 +64,7 @@ outputs:
              - '@'
              - {get_param: [EndpointMap, MysqlInternal, host]}
              - '/tacker'
-              - '?bind_address='
-              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'

        tacker::keystone::auth::tenant: 'service'
        tacker::keystone::auth::password: {get_param: TackerPassword}
--- a/roles_data.yaml
+++ b/roles_data.yaml
@ -47,6 +47,7 @@
    - OS::TripleO::Services::HeatApiCloudwatch
    - OS::TripleO::Services::HeatEngine
    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL3Agent
    - OS::TripleO::Services::NeutronMetadataAgent
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@ -62,14 +62,12 @@ def validate_mysql_connection(settings):
        return items == ['EndpointMap', 'MysqlInternal', 'protocol']

    def client_bind_address(item):
-        return 'bind_address' in item
+        return 'read_default_file' in item and \
+               'read_default_group' in item

    def validate_mysql_uri(key, items):
        # Only consider a connection if it targets mysql
-        # TODO(owalsh): skip nova mysql uris,temporary workaround for
-        # tripleo/+bug/1662344
-        if not key.startswith('nova') and \
-           key.endswith('connection') and \
+        if key.endswith('connection') and \
           search(items, mysql_protocol, no_op):
            # Assume the "bind_address" option is one of
            # the token that made up the uri