Get ppa:maas/next, add eth1 on controller, other minor edits

JIRA: JOID-3

Change-Id: I233ed10d6a41e4c3f21fd7b5229b20e3931f8375
Signed-off-by: blsaws <blsaws@hotmail.com>

diff --git a/ci/maas/att/virpod1/deployment.yaml b/ci/maas/att/virpod1/deployment.yaml
index 1400c7b..b8f37c7 100644 (file)
--- a/ci/maas/att/virpod1/deployment.yaml
+++ b/ci/maas/att/virpod1/deployment.yaml
@@ -5,7 +5,7 @@ demo-maas:
         # Defines the general setup for the MAAS environment, including the
         # username and password for the host as well as the MAAS server.
         user: ubuntu
-        password: opnfv-joid
+        password: ubuntu
 
         # Contains the virtual machine parameters for creating the MAAS virtual
         # server. Here you can configure the name of the virsh domain, the
@@ -22,7 +22,8 @@ demo-maas:
         apt_http_proxy:
 
         apt_sources:
-          - ppa:maas/stable
+#          - ppa:maas/stable
+          - ppa:maas/next
           - ppa:juju/stable
 
         # Virsh power settings
@@ -45,7 +46,7 @@ demo-maas:
         #  - http://maas.ubuntu.com/docs/api.html#maas-server
         settings:
             main_archive: http://us.archive.ubuntu.com/ubuntu
-            upstream_dns: 192.168.10.1
+            upstream_dns: 8.8.8.8
             maas_name: attvirpod1
             # kernel_opts: "console=tty0 console=ttyS1,115200n8"
             # ntp_server: ntp.ubuntu.com
@@ -72,7 +73,7 @@ demo-maas:
             network 192.168.10.0
             broadcast 192.168.10.255
             gateway 192.168.10.1
-            dns-nameservers 192.168.10.1 127.0.0.1
+            dns-nameservers 8.8.8.8 127.0.0.1
 
         # The node-group-interfaces section is used to configure the MAAS
         # network interfaces. Basic configuration is supported, such as which
@@ -100,10 +101,10 @@ demo-maas:
               tags: control
               architecture: amd64/generic
               mac_addresses:
-                  - "B8:AE:ED:76:FB:45"
+                  - "B8:AE:ED:76:F9:FF"
               power:
                   type: ether_wake
-                  address: B8:AE:ED:76:FB:45
+                  address: B8:AE:ED:76:F9:FF
 
             - name: compute1
               tags: compute

diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index a5ab161..be16b8c 100755 (executable)
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -64,7 +64,7 @@ case "$3" in
         # 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/192.168.1.1/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "juju-br0"/g' ./bundles.yaml
+         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "eth1"/g' ./bundles.yaml
         ;;
 esac