include the similar naming convention across the labs.

fix the bug in deployment of neutron-api

Change-Id: I95cf4e7a3c9c6b5df7ffe5431cb8cb0edb64f828
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/ci/maas/intel/pod5/deployment.yaml b/ci/maas/intel/pod5/deployment.yaml
index a33f8e0..a44d7a4 100755 (executable)
--- a/ci/maas/intel/pod5/deployment.yaml
+++ b/ci/maas/intel/pod5/deployment.yaml
@@ -10,7 +10,7 @@ demo-maas:
         # Contains the virtual machine parameters for creating the MAAS virtual
         # server. Here you can configure the name of the virsh domain, the
         # parameters for how the network is attached.
-        name: maas-boot-vm-dc1
+        name: opnfv-maas-intel
         interfaces: ['bridge=br0,model=virtio']
         memory: 4096
         vcpus: 2
@@ -46,7 +46,7 @@ demo-maas:
         settings:
             main_archive: http://us.archive.ubuntu.com/ubuntu
             upstream_dns: 10.4.0.2
-            maas_name: automaas
+            maas_name: intelpod5
             # kernel_opts: "console=tty0 console=ttyS1,115200n8"
             # ntp_server: ntp.ubuntu.com
 
@@ -108,7 +108,7 @@ demo-maas:
         # Defines the physical nodes which are added to the MAAS cluster
         # controller upon startup of the node.
         nodes:
-            - name: node5
+            - name: node5-compute
               tags: compute
               architecture: amd64/generic
               mac_addresses:
@@ -126,7 +126,7 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
                 
-            - name: node4
+            - name: node4-control
               tags: control
               architecture: amd64/generic
               mac_addresses:
@@ -144,7 +144,7 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node3
+            - name: node3-control
               tags: control
               architecture: amd64/generic
               mac_addresses:
@@ -162,7 +162,7 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node2
+            - name: node2-control
               tags: control
               architecture: amd64/generic
               mac_addresses:

diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml
index 18dead9..37395a7 100755 (executable)
--- a/ci/maas/intel/pod6/deployment.yaml
+++ b/ci/maas/intel/pod6/deployment.yaml
@@ -10,7 +10,7 @@ demo-maas:
         # Contains the virtual machine parameters for creating the MAAS virtual
         # server. Here you can configure the name of the virsh domain, the
         # parameters for how the network is attached.
-        name: maas-boot-vm-dc1
+        name: opnfv-maas-intel
         interfaces: ['bridge=br0,model=virtio']
         memory: 4096
         vcpus: 2
@@ -46,7 +46,7 @@ demo-maas:
         settings:
             main_archive: http://us.archive.ubuntu.com/ubuntu
             upstream_dns: 10.4.0.2
-            maas_name: automaas
+            maas_name: intelpod6
             # kernel_opts: "console=tty0 console=ttyS1,115200n8"
             # ntp_server: ntp.ubuntu.com
 
@@ -108,7 +108,7 @@ demo-maas:
         # Defines the physical nodes which are added to the MAAS cluster
         # controller upon startup of the node.
         nodes:
-            - name: node2
+            - name: node2-control
               tags: control
               architecture: amd64/generic
               mac_addresses:
@@ -144,7 +144,7 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node3
+            - name: node3-control
               tags: control
               architecture: amd64/generic
               mac_addresses:
@@ -162,7 +162,7 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node4
+            - name: node4-control
               tags: control
               architecture: amd64/generic
               mac_addresses:
@@ -180,7 +180,7 @@ demo-maas:
 #                  mac_address: "38:63:bb:43:b8:9c"
 #                  requested_address: 192.168.122.5
 
-            - name: node5
+            - name: node5-compute
               tags: compute
               architecture: amd64/generic
               mac_addresses:

diff --git a/ci/maas/orange/pod2/deployment.yaml b/ci/maas/orange/pod2/deployment.yaml
index 41c0f18..7af5ea8 100755 (executable)
--- a/ci/maas/orange/pod2/deployment.yaml
+++ b/ci/maas/orange/pod2/deployment.yaml
@@ -10,10 +10,10 @@ demo-maas:
         # Contains the virtual machine parameters for creating the MAAS virtual
         # server. Here you can configure the name of the virsh domain, the
         # parameters for how the network is attached.
-        name: maas2
+        name: opnfv-maas-orange
         interfaces: ['bridge=brAdm,model=virtio', 'bridge=brData,model=virtio', 'bridge=brStorage,model=virtio']
-        memory: 3072
-        vcpus: 1
+        memory: 4096
+        vcpus: 4
         arch: amd64
         pool: default
         disk_size: 120G
@@ -46,7 +46,7 @@ demo-maas:
         settings:
             main_archive: http://fr.archive.ubuntu.com/ubuntu
             upstream_dns: 8.8.8.8
-            maas_name: maas2
+            maas_name: orangepod2
             # kernel_opts: "console=tty0 console=ttyS1,115200n8"
             # ntp_server: ntp.ubuntu.com
 
@@ -279,7 +279,7 @@ demo-maas:
     juju-bootstrap:
         name: bootstrap
         interfaces: ['bridge=brAdm,model=virtio']
-        memory: 3072
+        memory: 4096
         vcpus: 2
         arch: amd64
         pool: default

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 20c0efe..62b2a04 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -87,6 +87,7 @@ openstack-phase2:
         - "lxc:nodes-api=2"
     "neutron-api": 
       branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      num_units: 3
       options:
         neutron-security-groups: False
         manage-neutron-plugin-legacy-mode: False