modified to match the taging with bundle.

Change-Id: Ib8671cdf4c041f33306e12fae5144ef85daa3556

3 files changed, 20 insertions, 20 deletions

diff --git a/ci/maas/intel/pod5/deployment.yaml b/ci/maas/intel/pod5/deployment.yaml
index caae88bd..a33f8e0d 100755
--- a/ci/maas/intel/pod5/deployment.yaml
+++ b/ci/maas/intel/pod5/deployment.yaml
@@ -108,8 +108,8 @@ demo-maas:
         # Defines the physical nodes which are added to the MAAS cluster
         # controller upon startup of the node.
         nodes:
-            - name: node1
-              tags: physical
+            - name: node5
+              tags: compute
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:e0:0a:4a"
@@ -118,7 +118,7 @@ demo-maas:
                   - "00:1e:67:d0:9a:11"
               power:
                   type: ipmi
-                  address: 10.4.2.8
+                  address: 10.4.7.5
                   user: root
                   pass: root
                   driver: LAN_2_0
@@ -126,8 +126,8 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
                 
-            - name: node2
-              tags: physical
+            - name: node4
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:e0:08:b0"
@@ -136,7 +136,7 @@ demo-maas:
                   - "00:1e:67:d0:99:ef"
               power:
                   type: ipmi
-                  address: 10.4.2.9
+                  address: 10.4.7.4
                   user: root
                   pass: root
                   driver: LAN_2_0
@@ -145,7 +145,7 @@ demo-maas:
 #                  requested_address: 192.168.122.5
 
             - name: node3
-              tags: physical
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:e0:08:7e"
@@ -154,7 +154,7 @@ demo-maas:
                   - "00:1e:67:c2:23:d9"
               power:
                   type: ipmi
-                  address: 10.4.2.7
+                  address: 10.4.7.3
                   user: root
                   pass: root
                   driver: LAN_2_0
@@ -162,8 +162,8 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node4
-              tags: physical
+            - name: node2
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:cf:b8:92"
@@ -172,7 +172,7 @@ demo-maas:
                   - "00:1e:67:d0:9b:0d"
               power:
                   type: ipmi
-                  address: 10.4.2.10
+                  address: 10.4.7.2
                   user: root
                   pass: root
                   driver: LAN_2_0
diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml
index 42cc2a88..18dead97 100755
--- a/ci/maas/intel/pod6/deployment.yaml
+++ b/ci/maas/intel/pod6/deployment.yaml
@@ -109,7 +109,7 @@ demo-maas:
         # controller upon startup of the node.
         nodes:
             - name: node2
-              tags: physical
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:e0:0b:71"
@@ -145,7 +145,7 @@ demo-maas:
 #                  requested_address: 192.168.122.5
 
             - name: node3
-              tags: physical
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:e0:09:32"
@@ -163,7 +163,7 @@ demo-maas:
 #                  requested_address: 192.168.122.5
 
             - name: node4
-              tags: physical
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:e0:09:fa"
@@ -181,7 +181,7 @@ demo-maas:
 #                  requested_address: 192.168.122.5
 
             - name: node5
-              tags: physical
+              tags: compute
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:cf:bc:f7"
diff --git a/ci/maas/orange/pod2/deployment.yaml b/ci/maas/orange/pod2/deployment.yaml
index a1422f8c..99fa7267 100755
--- a/ci/maas/orange/pod2/deployment.yaml
+++ b/ci/maas/orange/pod2/deployment.yaml
@@ -109,7 +109,7 @@ demo-maas:
         # controller upon startup of the node.
         nodes:
             - name: node1-compute
-              tags: physical
+              tags: compute
               architecture: amd64/generic
               mac_addresses:
                   - "38:63:bb:3f:bc:c8" 
@@ -129,7 +129,7 @@ demo-maas:
 #                  requested_address: 192.168.122.5
 #                
             - name: node2-compute
-              tags: physical
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "38:63:bb:44:34:84"
@@ -146,7 +146,7 @@ demo-maas:
                   driver: LAN_2_0
 
             - name: node3-compute
-              tags: physical
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "38:63:bb:3f:1d:8c"
@@ -163,7 +163,7 @@ demo-maas:
                   driver: LAN_2_0
 
             - name: node4-compute
-              tags: physical
+              tags: control
               architecture: amd64/generic
               mac_addresses:
                   - "38:63:bb:3f:2d:a8"
@@ -195,7 +195,7 @@ demo-maas:
 #                  driver: LAN_2_0
 
             - name: node6-control
-              tags: control
+              tags: physical
               architecture: amd64/generic
               mac_addresses:
                   - "00:1a:64:c8:a8:14"