From 796c77e4b26d3f2f166db7c0bb1d6b1bcc5f460a Mon Sep 17 00:00:00 2001 From: yatin Date: Fri, 9 Jun 2017 12:52:08 +0530 Subject: [PATCH] Checkout stable/ocata branches when installing via devstack Change-Id: Icc1b9c93ebbdffd99511ed82b560c0496bd6bdba --- devstack/README.rst | 4 ++-- devstack/settings | 3 ++- doc/source/dev/quickstart.rst | 16 ++++++++-------- doc/source/troubleshooting-guide.rst | 4 ++-- magnum/tests/contrib/gate_hook.sh | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/devstack/README.rst b/devstack/README.rst index bfd1f779d6..f341e6d5aa 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -17,8 +17,8 @@ magnum plugin:: cat > /opt/stack/devstack/local.conf << END [[local|localrc]] - enable_plugin heat https://github.com/openstack/heat master - enable_plugin magnum https://github.com/openstack/magnum master + enable_plugin heat https://github.com/openstack/heat stable/ocata + enable_plugin magnum https://github.com/openstack/magnum stable/ocata END Additionally, you might need additional Neutron configurations for diff --git a/devstack/settings b/devstack/settings index cb217e76ff..eb1ef2f7ee 100644 --- a/devstack/settings +++ b/devstack/settings @@ -14,7 +14,8 @@ # TENANT_VLAN_RANGE= # PHYSICAL_NETWORK=public # OVS_PHYSICAL_BRIDGE=br-ex - +export MAGNUMCLIENT_BRANCH=stable/ocata +export BARBICANCLIENT_BRANCH=stable/ocata # Enable Neutron which is required by Magnum and disable nova-network. disable_service n-net enable_service q-svc diff --git a/doc/source/dev/quickstart.rst b/doc/source/dev/quickstart.rst index d5fc4cfcca..4e9905773d 100644 --- a/doc/source/dev/quickstart.rst +++ b/doc/source/dev/quickstart.rst @@ -101,7 +101,7 @@ Clone devstack:: sudo mkdir -p /opt/stack sudo chown $USER /opt/stack - git clone https://git.openstack.org/openstack-dev/devstack /opt/stack/devstack + git clone https://git.openstack.org/openstack-dev/devstack /opt/stack/devstack -b stable/ocata We will run devstack with minimal local.conf settings required to enable magnum, heat, and neutron (neutron is enabled by default in devstack since @@ -119,15 +119,15 @@ Kilo, and heat must be enabled by yourself):: # Enable barbican service and use it to store TLS certificates # For details http://docs.openstack.org/developer/magnum/dev/tls.html - enable_plugin barbican https://git.openstack.org/openstack/barbican + enable_plugin barbican https://git.openstack.org/openstack/barbican stable/ocata - enable_plugin heat https://git.openstack.org/openstack/heat + enable_plugin heat https://git.openstack.org/openstack/heat stable/ocata # Enable magnum plugin after dependent plugins - enable_plugin magnum https://git.openstack.org/openstack/magnum + enable_plugin magnum https://git.openstack.org/openstack/magnum stable/ocata # Optional: uncomment to enable the Magnum UI plugin in Horizon - #enable_plugin magnum-ui https://github.com/openstack/magnum-ui + #enable_plugin magnum-ui https://github.com/openstack/magnum-ui stable/ocata VOLUME_BACKING_FILE_SIZE=20G END @@ -140,8 +140,8 @@ Optionally, you can enable neutron/lbaas v2 with octavia to create load balancers for multi master clusters:: cat >> /opt/stack/devstack/local.conf << END - enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas - enable_plugin octavia https://git.openstack.org/openstack/octavia + enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas stable/ocata + enable_plugin octavia https://git.openstack.org/openstack/octavia stable/ocata # Disable LBaaS(v1) service disable_service q-lbaas @@ -158,7 +158,7 @@ Optionally, you can enable ceilometer in devstack. If ceilometer is enabled, magnum will periodically send metrics to ceilometer:: cat >> /opt/stack/devstack/local.conf << END - enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer + enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer stable/ocata END If you want to deploy Docker Registry 2.0 in your cluster, you should enable diff --git a/doc/source/troubleshooting-guide.rst b/doc/source/troubleshooting-guide.rst index 769bc05df6..b5c5ac0f9a 100644 --- a/doc/source/troubleshooting-guide.rst +++ b/doc/source/troubleshooting-guide.rst @@ -756,8 +756,8 @@ Simulating gate tests export PROJECTS="openstack/magnum $PROJECTS" export PROJECTS="openstack/python-magnumclient $PROJECTS" export PROJECTS="openstack/barbican $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum stable/ocata" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer stable/ocata" # Keep localrc to be able to set some vars in post_test_hook export KEEP_LOCALRC=1 function gate_hook { diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh index 9490ea33a6..dbaf9a5da0 100755 --- a/magnum/tests/contrib/gate_hook.sh +++ b/magnum/tests/contrib/gate_hook.sh @@ -19,7 +19,7 @@ coe=$1 special=$2 export PROJECTS="openstack/barbican $PROJECTS" -export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat" +export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat stable/ocata" export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon" export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" @@ -52,7 +52,7 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then # NOTE(strigazi) keep cinder # export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder c-sch c-api c-vol" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic stable/ocata" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ssh" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True" @@ -85,6 +85,6 @@ else fi # Enable magnum plugin in the last step -export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum stable/ocata" $BASE/new/devstack-gate/devstack-vm-gate.sh