From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 19 Jan 2017 17:51:17 +0000 (+0000)
Subject: Merge "Remove redundant CLI arguments for neutron-db-manage"
X-Git-Tag: opnfv-6.0.0~1212
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=739e90e4630169752e28e4c9bb97f5bbcbb0ebb5;p=apex-tripleo-heat-templates.git

Merge "Remove redundant CLI arguments for neutron-db-manage"
---

739e90e4630169752e28e4c9bb97f5bbcbb0ebb5
diff --cc extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
index a3ce393f,6fd29991..a3cbd945
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
@@@ -57,10 -57,10 +57,10 @@@ if [[ -n $(is_bootstrap_node) ]]; the
      # TODO: check if this can be triggered in puppet and removed from here
      ceilometer-upgrade --config-file=/etc/ceilometer/ceilometer.conf --skip-gnocchi-resource-types
      cinder-manage db sync
 -    glance-manage --config-file=/etc/glance/glance-registry.conf db_sync
 +    glance-manage db_sync
      heat-manage --config-file /etc/heat/heat.conf db_sync
      keystone-manage db_sync
-     neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head
+     neutron-db-manage upgrade heads
      nova-manage db sync
      nova-manage api_db sync
      nova-manage db online_data_migrations