summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryatin <ykarel@redhat.com>2017-06-09 12:52:08 +0530
committeryatin <ykarel@redhat.com>2017-06-16 19:43:12 +0530
commit796c77e4b26d3f2f166db7c0bb1d6b1bcc5f460a (patch)
treea76e91bbc6215d89f983127efc93d0efa9ed18cf
parentbdddbdf2defd5b8cd4996ee6163746571146ea7c (diff)
Checkout stable/ocata branches when installing via devstack
Notes
Notes (review): Code-Review+2: Madhuri Kumari <madhuri.kumari@intel.com> Code-Review+2: Spyros Trigazis (strigazi) <strigazi@gmail.com> Workflow+1: Spyros Trigazis (strigazi) <strigazi@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 28 Jun 2017 10:46:15 +0000 Reviewed-on: https://review.openstack.org/472550 Project: openstack/magnum Branch: refs/heads/stable/ocata
-rw-r--r--devstack/README.rst4
-rw-r--r--devstack/settings3
-rw-r--r--doc/source/dev/quickstart.rst16
-rw-r--r--doc/source/troubleshooting-guide.rst4
-rwxr-xr-xmagnum/tests/contrib/gate_hook.sh6
5 files changed, 17 insertions, 16 deletions
diff --git a/devstack/README.rst b/devstack/README.rst
index bfd1f77..f341e6d 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -17,8 +17,8 @@ magnum plugin::
17 17
18 cat > /opt/stack/devstack/local.conf << END 18 cat > /opt/stack/devstack/local.conf << END
19 [[local|localrc]] 19 [[local|localrc]]
20 enable_plugin heat https://github.com/openstack/heat master 20 enable_plugin heat https://github.com/openstack/heat stable/ocata
21 enable_plugin magnum https://github.com/openstack/magnum master 21 enable_plugin magnum https://github.com/openstack/magnum stable/ocata
22 END 22 END
23 23
24Additionally, you might need additional Neutron configurations for 24Additionally, you might need additional Neutron configurations for
diff --git a/devstack/settings b/devstack/settings
index cb217e7..eb1ef2f 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -14,7 +14,8 @@
14# TENANT_VLAN_RANGE= 14# TENANT_VLAN_RANGE=
15# PHYSICAL_NETWORK=public 15# PHYSICAL_NETWORK=public
16# OVS_PHYSICAL_BRIDGE=br-ex 16# OVS_PHYSICAL_BRIDGE=br-ex
17 17export MAGNUMCLIENT_BRANCH=stable/ocata
18export BARBICANCLIENT_BRANCH=stable/ocata
18# Enable Neutron which is required by Magnum and disable nova-network. 19# Enable Neutron which is required by Magnum and disable nova-network.
19disable_service n-net 20disable_service n-net
20enable_service q-svc 21enable_service q-svc
diff --git a/doc/source/dev/quickstart.rst b/doc/source/dev/quickstart.rst
index d5fc4cf..4e99057 100644
--- a/doc/source/dev/quickstart.rst
+++ b/doc/source/dev/quickstart.rst
@@ -101,7 +101,7 @@ Clone devstack::
101 sudo mkdir -p /opt/stack 101 sudo mkdir -p /opt/stack
102 sudo chown $USER /opt/stack 102 sudo chown $USER /opt/stack
103 103
104 git clone https://git.openstack.org/openstack-dev/devstack /opt/stack/devstack 104 git clone https://git.openstack.org/openstack-dev/devstack /opt/stack/devstack -b stable/ocata
105 105
106We will run devstack with minimal local.conf settings required to enable 106We will run devstack with minimal local.conf settings required to enable
107magnum, heat, and neutron (neutron is enabled by default in devstack since 107magnum, heat, and neutron (neutron is enabled by default in devstack since
@@ -119,15 +119,15 @@ Kilo, and heat must be enabled by yourself)::
119 119
120 # Enable barbican service and use it to store TLS certificates 120 # Enable barbican service and use it to store TLS certificates
121 # For details http://docs.openstack.org/developer/magnum/dev/tls.html 121 # For details http://docs.openstack.org/developer/magnum/dev/tls.html
122 enable_plugin barbican https://git.openstack.org/openstack/barbican 122 enable_plugin barbican https://git.openstack.org/openstack/barbican stable/ocata
123 123
124 enable_plugin heat https://git.openstack.org/openstack/heat 124 enable_plugin heat https://git.openstack.org/openstack/heat stable/ocata
125 125
126 # Enable magnum plugin after dependent plugins 126 # Enable magnum plugin after dependent plugins
127 enable_plugin magnum https://git.openstack.org/openstack/magnum 127 enable_plugin magnum https://git.openstack.org/openstack/magnum stable/ocata
128 128
129 # Optional: uncomment to enable the Magnum UI plugin in Horizon 129 # Optional: uncomment to enable the Magnum UI plugin in Horizon
130 #enable_plugin magnum-ui https://github.com/openstack/magnum-ui 130 #enable_plugin magnum-ui https://github.com/openstack/magnum-ui stable/ocata
131 131
132 VOLUME_BACKING_FILE_SIZE=20G 132 VOLUME_BACKING_FILE_SIZE=20G
133 END 133 END
@@ -140,8 +140,8 @@ Optionally, you can enable neutron/lbaas v2 with octavia to create load
140balancers for multi master clusters:: 140balancers for multi master clusters::
141 141
142 cat >> /opt/stack/devstack/local.conf << END 142 cat >> /opt/stack/devstack/local.conf << END
143 enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas 143 enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas stable/ocata
144 enable_plugin octavia https://git.openstack.org/openstack/octavia 144 enable_plugin octavia https://git.openstack.org/openstack/octavia stable/ocata
145 145
146 # Disable LBaaS(v1) service 146 # Disable LBaaS(v1) service
147 disable_service q-lbaas 147 disable_service q-lbaas
@@ -158,7 +158,7 @@ Optionally, you can enable ceilometer in devstack. If ceilometer is enabled,
158magnum will periodically send metrics to ceilometer:: 158magnum will periodically send metrics to ceilometer::
159 159
160 cat >> /opt/stack/devstack/local.conf << END 160 cat >> /opt/stack/devstack/local.conf << END
161 enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer 161 enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer stable/ocata
162 END 162 END
163 163
164If you want to deploy Docker Registry 2.0 in your cluster, you should enable 164If 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 769bc05..b5c5ac0 100644
--- a/doc/source/troubleshooting-guide.rst
+++ b/doc/source/troubleshooting-guide.rst
@@ -756,8 +756,8 @@ Simulating gate tests
756 export PROJECTS="openstack/magnum $PROJECTS" 756 export PROJECTS="openstack/magnum $PROJECTS"
757 export PROJECTS="openstack/python-magnumclient $PROJECTS" 757 export PROJECTS="openstack/python-magnumclient $PROJECTS"
758 export PROJECTS="openstack/barbican $PROJECTS" 758 export PROJECTS="openstack/barbican $PROJECTS"
759 export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum" 759 export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum stable/ocata"
760 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" 760 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer stable/ocata"
761 # Keep localrc to be able to set some vars in post_test_hook 761 # Keep localrc to be able to set some vars in post_test_hook
762 export KEEP_LOCALRC=1 762 export KEEP_LOCALRC=1
763 function gate_hook { 763 function gate_hook {
diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh
index 9490ea3..dbaf9a5 100755
--- a/magnum/tests/contrib/gate_hook.sh
+++ b/magnum/tests/contrib/gate_hook.sh
@@ -19,7 +19,7 @@ coe=$1
19special=$2 19special=$2
20 20
21export PROJECTS="openstack/barbican $PROJECTS" 21export PROJECTS="openstack/barbican $PROJECTS"
22export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat" 22export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat stable/ocata"
23 23
24export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon" 24export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon"
25export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" 25export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
@@ -52,7 +52,7 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
52 # NOTE(strigazi) keep cinder 52 # NOTE(strigazi) keep cinder
53 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder c-sch c-api c-vol" 53 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder c-sch c-api c-vol"
54 54
55 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" 55 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic stable/ocata"
56 56
57 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ssh" 57 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ssh"
58 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True" 58 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True"
@@ -85,6 +85,6 @@ else
85fi 85fi
86 86
87# Enable magnum plugin in the last step 87# Enable magnum plugin in the last step
88export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum" 88export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum stable/ocata"
89 89
90$BASE/new/devstack-gate/devstack-vm-gate.sh 90$BASE/new/devstack-gate/devstack-vm-gate.sh