From edfc54aca89173678f53b9f49f9e4fee60a5df9d Mon Sep 17 00:00:00 2001 From: Vitaly Gridnev Date: Wed, 7 Jun 2017 19:16:08 +0400 Subject: [PATCH] Refine settings of grenade in ocata Change-Id: I34c48f22d5330c02bc082471beefb95e6648e563 --- devstack/upgrade/settings | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 93c9a3d1b6..0ae57632b4 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -2,31 +2,25 @@ register_project_for_upgrade sahara register_db_to_save sahara -devstack_localrc base disable_service n-net -devstack_localrc base enable_service \ - h-api h-api-cfn h-api-cw h-eng heat \ - q-agt q-dhcp q-l3 q-meta q-svc neutron \ - tempest ceilometer-alarm-evaluator \ - ceilometer-alarm-notifier \ - ceilometer-anotification + devstack_localrc base IMAGE_URLS=\ "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz,\ http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2" devstack_localrc base enable_plugin sahara \ git://git.openstack.org/openstack/sahara \ - stable/mitaka + stable/newton +devstack_localrc base enable_plugin heat \ + git://git.openstack.org/openstack/heat \ + stable/newton devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.2-x86_64-uec" -devstack_localrc target disable_service n-net -devstack_localrc target enable_service \ - h-api h-api-cfn h-api-cw h-eng heat \ - q-agt q-dhcp q-l3 q-meta q-svc neutron \ - tempest ceilometer-alarm-evaluator \ - ceilometer-alarm-notifier \ - ceilometer-anotification devstack_localrc target IMAGE_URLS=\ "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz,\ http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2" devstack_localrc target enable_plugin sahara \ - git://git.openstack.org/openstack/sahara + git://git.openstack.org/openstack/sahara \ + stable/ocata +devstack_localrc target enable_plugin heat \ + git://git.openstack.org/openstack/heat \ + stable/ocata devstack_localrc target LIBS_FROM_GIT=python-saharaclient devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.2-x86_64-uec"