X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-api.yaml;h=cb6317d2bd49a4572dcc8e023b03afc81dc68bb0;hb=6c8f5017d7b1d4e69451bbced7556828346bf18c;hp=65fa0d8fedf6504ce2b40bb2e5024c1558c3bbe2;hpb=a6522190b36401e494338ad4c91909b61168759d;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml
index 65fa0d8f..cb6317d2 100644
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@@ -127,17 +127,14 @@ 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, KeystoneAdmin, uri_no_suffix]}
+            neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
             neutron::server::api_workers: {get_param: NeutronWorkers}
             neutron::server::rpc_workers: {get_param: NeutronWorkers}
             neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
             neutron::server::enable_proxy_headers_parsing: true
             neutron::keystone::authtoken::password: {get_param: NeutronPassword}
-
-            neutron::server::notifications::nova_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
             neutron::server::notifications::auth_url: { get_param: [ EndpointMap, KeystoneV3Admin, uri ] }
             neutron::server::notifications::tenant_name: 'service'
             neutron::server::notifications::project_name: 'service'
@@ -196,8 +193,5 @@ outputs:
           shell: /usr/bin/systemctl show 'neutron-server' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop neutron_api service
-          tags: step2
+          tags: step1
           service: name=neutron-server state=stopped
-        - name: Sync neutron_api DB
-          tags: step5
-          command: neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head