Browse Source

Checkout stable/ocata branches when installing via devstack

Change-Id: Icc1b9c93ebbdffd99511ed82b560c0496bd6bdba
yatin 1 year ago
parent
commit
796c77e4b2

+ 2
- 2
devstack/README.rst View File

@@ -17,8 +17,8 @@ magnum plugin::
17 17
 
18 18
      cat > /opt/stack/devstack/local.conf << END
19 19
      [[local|localrc]]
20
-     enable_plugin heat https://github.com/openstack/heat master
21
-     enable_plugin magnum https://github.com/openstack/magnum master
20
+     enable_plugin heat https://github.com/openstack/heat stable/ocata
21
+     enable_plugin magnum https://github.com/openstack/magnum stable/ocata
22 22
      END
23 23
 
24 24
 Additionally, you might need additional Neutron configurations for

+ 2
- 1
devstack/settings View File

@@ -14,7 +14,8 @@
14 14
 # TENANT_VLAN_RANGE=
15 15
 # PHYSICAL_NETWORK=public
16 16
 # OVS_PHYSICAL_BRIDGE=br-ex
17
-
17
+export MAGNUMCLIENT_BRANCH=stable/ocata
18
+export BARBICANCLIENT_BRANCH=stable/ocata
18 19
 # Enable Neutron which is required by Magnum and disable nova-network.
19 20
 disable_service n-net
20 21
 enable_service q-svc

+ 8
- 8
doc/source/dev/quickstart.rst View File

@@ -101,7 +101,7 @@ Clone devstack::
101 101
     sudo mkdir -p /opt/stack
102 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
 
106 106
 We will run devstack with minimal local.conf settings required to enable
107 107
 magnum, 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 120
     # Enable barbican service and use it to store TLS certificates
121 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 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 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 132
     VOLUME_BACKING_FILE_SIZE=20G
133 133
     END
@@ -140,8 +140,8 @@ Optionally, you can enable neutron/lbaas v2 with octavia to create load
140 140
 balancers for multi master clusters::
141 141
 
142 142
     cat >> /opt/stack/devstack/local.conf << END
143
-    enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas
144
-    enable_plugin octavia https://git.openstack.org/openstack/octavia
143
+    enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas stable/ocata
144
+    enable_plugin octavia https://git.openstack.org/openstack/octavia stable/ocata
145 145
 
146 146
     # Disable LBaaS(v1) service
147 147
     disable_service q-lbaas
@@ -158,7 +158,7 @@ Optionally, you can enable ceilometer in devstack. If ceilometer is enabled,
158 158
 magnum will periodically send metrics to ceilometer::
159 159
 
160 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 162
     END
163 163
 
164 164
 If you want to deploy Docker Registry 2.0 in your cluster, you should enable

+ 2
- 2
doc/source/troubleshooting-guide.rst View File

@@ -756,8 +756,8 @@ Simulating gate tests
756 756
       export PROJECTS="openstack/magnum $PROJECTS"
757 757
       export PROJECTS="openstack/python-magnumclient $PROJECTS"
758 758
       export PROJECTS="openstack/barbican $PROJECTS"
759
-      export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum"
760
-      export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
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 stable/ocata"
761 761
       # Keep localrc to be able to set some vars in post_test_hook
762 762
       export KEEP_LOCALRC=1
763 763
       function gate_hook {

+ 3
- 3
magnum/tests/contrib/gate_hook.sh View File

@@ -19,7 +19,7 @@ coe=$1
19 19
 special=$2
20 20
 
21 21
 export PROJECTS="openstack/barbican $PROJECTS"
22
-export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat"
22
+export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat stable/ocata"
23 23
 
24 24
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon"
25 25
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
@@ -52,7 +52,7 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
52 52
     # NOTE(strigazi) keep cinder
53 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 57
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ssh"
58 58
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True"
@@ -85,6 +85,6 @@ else
85 85
 fi
86 86
 
87 87
 # Enable magnum plugin in the last step
88
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
88
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum stable/ocata"
89 89
 
90 90
 $BASE/new/devstack-gate/devstack-vm-gate.sh

Loading…
Cancel
Save