summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIhar Hrachyshka <ihrachys@redhat.com>2016-12-06 22:37:53 +0000
committerIhar Hrachyshka <ihrachys@redhat.com>2016-12-06 22:37:53 +0000
commit1102b648658f39ba03bc5b423cfc3597a5f7d8fd (patch)
treecf9cb098772cfb27ca75a7e20deb29a5f63ba884
parent94a42fb5b7d59d6383e4d9186216195aa742a836 (diff)
Remove redundant CLI arguments for neutron-db-manage
neutron.conf is found by the virtue of oslo.config auto-discovery mechanism; and plugin.ini is no longer needed since Juno because now schema does not depend on plugin used. While at it, switched head -> heads to reflect recent changes in neutron with multiple alembic branches. The old format still works, but 'heads' is slightly more encouraged. Change-Id: I614a6d43087fa231f0d582bab10a82480aaefda5 Related: Icc4de9824ef95781a1d060534973c2bbf8e03059
-rwxr-xr-xextraconfig/tasks/major_upgrade_controller_pacemaker_3.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
index 6748f891..6fd29991 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
@@ -60,7 +60,7 @@ if [[ -n $(is_bootstrap_node) ]]; then
glance-manage --config-file=/etc/glance/glance-registry.conf 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