diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/01-deploybundle.sh | 10 | ||||
| -rwxr-xr-x | ci/02-maasdeploy.sh | 17 |
2 files changed, 5 insertions, 22 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 4e465c5c..f12069af 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -47,16 +47,6 @@ if [ -e ~/.juju/deployment.yaml ]; then fi case "$3" in - 'cengnlynxpod1' ) - # Chose the hard drive(s) to use for CEPH OSD - sed -i -- 's|osd-devices: /srv|osd-devices: /dev/sdb|g' ./bundles.yaml - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/10.120.0.1/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 172.16.121.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1.1202"/g' ./bundles.yaml - ;; 'juniperpod1' ) sed -i -- 's/10.4.1.1/172.16.50.1/g' ./bundles.yaml sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 62e57da5..ce3208e8 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -74,14 +74,16 @@ else 'juniperpod1' ) cp maas/juniper/pod1/deployment.yaml ./deployment.yaml ;; - 'cengnlynxpod1' ) - cp maas/cengn_lynx/pod1/deployment.yaml ./deployment.yaml - ;; 'cengnpod1' ) cp ../labconfig/cengn/pod1/labconfig.yaml ./ #to be removed later once converted for all labs. python deploy.py ;; + 'cengnpod2' ) + cp ../labconfig/cengn/pod2/labconfig.yaml ./ + #to be removed later once converted for all labs. + python deploy.py + ;; * ) virtinstall=1 labname="default" @@ -300,15 +302,6 @@ case "$labname" in ;; 'juniperpod1' ) ;; - 'cengnlynxpod1' ) - maas refresh - crvlanupdsubnet vlan1201 1 "DataNetwork" 1201 2 || true - crvlanupdsubnet vlan1202 2 "PublicNetwork" 1202 3 || true - crnodevlanint $vlan1201 eth1 || true - crnodevlanint $vlan1202 eth1 || true - enableautomode eth1.1201 AUTO "172.16.121.3/24" compute || true - enableautomode eth1.1201 AUTO "172.16.121.3/24" control || true - ;; esac enable_if |