Refactor cengnlynxpod1 to cengnpod2 and use labconfig

The intent of this commit is to refactor the CENGEN internal pod
to use more conventional naming as well as leverage the new pod
configuration design.
JIRA: JOID-86

Change-Id: I2ac4f15cdcc919a07135c7b4b4cc6939104a89fa
Signed-off-by: Dave Urschatz <dave.urschatz@cengn.ca>

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 4e465c5..f12069a 100755 (executable)
--- 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 62e57da..ce3208e 100755 (executable)
--- 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

diff --git a/labconfig/cengn/pod2/labconfig.yaml b/labconfig/cengn/pod2/labconfig.yaml
new file mode 100644 (file)
index 0000000..1c08994
--- /dev/null
+++ b/labconfig/cengn/pod2/labconfig.yaml
@@ -0,0 +1,145 @@
+lab:
+  location: cengn
+  racks:
+  - rack: pod2
+    # Define one network and control and two control, compute and storage
+    # and rest for compute and storage for backward compaibility. again
+    # server with more disks should be used for compute and storage only.
+    nodes:
+    # DCOMP4-B, 24cores, 64G, 2disk, 4TBdisk
+    - name: rack-2-m1
+      architecture: x86_64
+      roles: [network,control]
+      nics:
+      - ifname: eth0
+        spaces: [admin]
+        mac: ["0c:c4:7a:3a:c5:b6"]
+      - ifname: eth2
+        spaces: [public]
+        mac: ["0c:c4:7a:3a:c5:b7"]
+      - ifname: eth1
+        spaces: [data]
+        mac: ["0c:c4:7a:1f:d7:f4"]
+      - ifname: eth3
+        spaces: [storage]
+        mac: ["0c:c4:7a:1f:d7:f5"]
+      power:
+        type: ipmi
+        address: 192.168.42.72
+        user: root
+        pass: root
+    # PCOMP2-D, 48cores, 128G, 3disk, 1TBdisk
+    - name: rack-2-m2
+      architecture: x86_64
+      roles: [control,compute,storage]
+      nics:
+      - ifname: eth0
+        spaces: [admin]
+        mac: ["0c:c4:7a:3a:b2:ae"]
+      - ifname: eth1
+        spaces: [data]
+        mac: ["0c:c4:7a:1f:d9:f0"]
+      - ifname: eth3
+        spaces: [storage]
+        mac: ["0c:c4:7a:1f:d9:f1"]
+      power:
+        type: ipmi
+        address: 192.168.42.40
+        user: root
+        pass: root
+    # PCTRL2, 24cores, 64G, 3disk, 6TBdisk
+    - name: rack-2-m3
+      architecture: x86_64
+      roles: [control,compute,storage]
+      nics:
+      - ifname: eth0
+        spaces: [admin]
+        mac: ["0c:c4:7a:1f:6f:c0"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["0c:c4:7a:1f:d5:0e"]
+      - ifname: eth5
+        spaces: [storage]
+        mac: ["0c:c4:7a:1f:d5:0f"]
+      power:
+        type: ipmi
+        address: 192.168.42.33
+        user: root
+        pass: root
+    # PSTOR1, 12cores, 32G, 14disk, 24TBdisk
+    - name: rack-2-m4
+      architecture: x86_64
+      roles: [storage,compute]
+      nics:
+      - ifname: eth0
+        spaces: [admin]
+        mac: ["0c:c4:7a:31:9d:bc"]
+      - ifname: eth5
+        spaces: [data]
+        mac: ["0c:c4:7a:59:ac:12"]
+      - ifname: eth4
+        spaces: [storage]
+        mac: ["0c:c4:7a:59:ac:13"]
+      - ifname: eth1
+        spaces: [public]
+        mac: ["0c:c4:7a:31:9d:bd"]
+      power:
+        type: ipmi
+        address: 192.168.42.6
+        user: root
+        pass: root
+    # PSTOR2, 12cores, 32G, 14disk, 24TBdisk
+    - name: rack-2-m5
+      architecture: x86_64
+      roles: [storage,compute]
+      nics:
+      - ifname: eth0
+        spaces: [admin]
+        mac: ["00:25:90:fd:2e:48"]
+      - ifname: eth1
+        spaces: [data]
+        mac: ["0c:c4:7a:1f:8c:6a"]
+      - ifname: eth4
+        spaces: [storage]
+        mac: ["0c:c4:7a:1f:8c:6b"]
+      power:
+        type: ipmi
+        address: 192.168.42.35
+        user: root
+        pass: root
+    floating-ip-range: 172.16.120.20,172.16.120.62,172.16.120.254,172.16.120.0/24
+    # Mutiple MACs seperated by space where MACs are from ext-ports across all network nodes.
+    # eth1 of m4 since tags for networking are not yet implemented.
+    ext-port: "eth1"
+    dns: 8.8.8.8
+
+opnfv:
+  release: c
+  distro: trusty
+  type: nonha
+  openstack: liberty
+  sdncontroller:
+  - type: nosdn
+  storage:
+  - type: ceph
+    disk: /dev/sdb /dev/sdc
+  feature: odl_l2
+  spaces:
+  - type: admin
+    bridge: brAdm
+    cidr: 10.120.0.0/24
+    gateway: 10.120.0.254
+    vlan:
+  - type: data
+    bridge: brData
+    cidr: 192.168.11.0/24
+    gateway:
+    vlan:
+  - type: storage
+    bridge: brStorage
+    cidr: 192.168.21.0/24
+    gateway:
+  - type: public
+    bridge: brPublic
+    cidr: 172.16.120.0/24
+    gateway: 172.16.120.254