added the deployment.yaml so that maas-deployer can be deployed

with scripts itself with csripts.

modified the yaml file further to deploy gateway on bare metal.
rename 01-bootstrap.sh to 00-bootstrap.sh for sequence.

Change-Id: Ic409871f4e99158308bee2860132cda94ce10b42

8 files changed, 198 insertions, 9 deletions

diff --git a/ci/01-bootstrap.sh b/ci/00-bootstrap.sh
index c04ae2da..c04ae2da 100755
--- a/ci/01-bootstrap.sh
+++ b/ci/00-bootstrap.sh
diff --git a/ci/clean.sh b/ci/clean.sh
index 7affbe71..3e990eae 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -3,7 +3,7 @@
 set -ex
 
 #juju-deployer -T -d
-juju destroy-environment maas  -y
+juju destroy-environment demo-maas  -y
 rm -rf ~/.juju/j*
 rm -rf ~/.juju/environments
 rm -rf ~/.juju/ssh
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 9721a4b0..7f39a935 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -ex
-./01-bootstrap.sh
+./00-bootstrap.sh
 
 #need to put mutiple cases here where decide this bundle to deploy by default use the odl bundle.
 # Below parameters are the default and we can according the release
diff --git a/ci/intel/pod5/environment.yaml b/ci/intel/pod5/environment.yaml
index 10f7637b..e5b539ca 100644
--- a/ci/intel/pod5/environment.yaml
+++ b/ci/intel/pod5/environment.yaml
@@ -1,4 +1,4 @@
-default: maas
+default: demo-maas
 environments:
     # https://juju.ubuntu.com/docs/config-maas.html
     maas:
diff --git a/ci/intel/pod5/maas/deployment.yaml b/ci/intel/pod5/maas/deployment.yaml
new file mode 100755
index 00000000..8b777790
--- /dev/null
+++ b/ci/intel/pod5/maas/deployment.yaml
@@ -0,0 +1,188 @@
+# This file defines the deployment for the MAAS environment which is to be
+# deployed and automated.
+demo-maas:
+    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: ubuntu
+
+        # 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
+        interfaces: ['bridge=br0,model=virtio']
+        memory: 4096
+        vcpus: 2
+        arch: amd64
+        pool: default
+        disk_size: 160G
+
+        # Apt http proxy setting(s)
+        apt_http_proxy:
+
+        # Virsh power settings
+        # Specifies the uri and keys to use for virsh power control of the 
+        # juju virtual machine. If the uri is omitted, the value for the
+        # --remote is used. If no power settings are desired, then do not
+        # supply the virsh block.
+        virsh:
+            rsa_priv_key: /home/ubuntu/id_rsa
+            rsa_pub_key: /home/ubuntu/id_rsa.pub
+            uri: qemu+ssh://user@10.4.1.1/system
+
+        # Defines the IP Address that the configuration script will use to
+        # to access the MAAS controller via SSH.
+        ip_address: 10.4.1.2
+
+        # This section allows the user to set a series of options on the
+        # MAAS server itself. The list of config options can be found in
+        # the upstream MAAS documentation:
+        #  - http://maas.ubuntu.com/docs/api.html#maas-server
+        settings:
+            main_archive: http://us.archive.ubuntu.com/ubuntu
+            upstream_dns: 10.4.0.2
+            maas_name: automaas
+            # kernel_opts: "console=tty0 console=ttyS1,115200n8"
+            # ntp_server: ntp.ubuntu.com
+
+        # This section is used to define the networking parameters for when
+        # the node first comes up. It is fed into the meta-data cloud-init
+        # configuration and is used to configure the networking piece of the
+        # service. The contents of this section are written directly to the
+        # /etc/network/interfaces file.
+        #
+        # Please note, this is slightly different than the
+        # node-group-interfaces section below. This will configure the
+        # machine's networking params, and the node-group-interfaces will
+        # configure the maas node-group interfaces which is used for
+        # controlling the dhcp, dns, etc.
+        network_config: |
+            auto lo
+            iface lo inet loopback
+
+            auto eth0
+            iface eth0 inet static
+            address 10.4.1.2
+            netmask 255.255.248.0
+            network 10.4.0.0
+            broadcast 10.4.7.255
+            gateway 10.4.0.1
+            dns-nameservers 10.4.0.2 127.0.0.1
+
+            #auto lo
+            #iface lo inet loopback
+
+            #auto eth0
+            #iface eth0 inet static
+            #  address 192.168.122.2
+            #  netmask 255.255.248.0
+            #  network 192.168.122.0
+            #  broadcast 192.168.122.255
+            #  gateway 192.168.122.1
+            #  dns-nameservers 192.168.122.1 127.0.0.1
+
+        # The node-group-interfaces section is used to configure the MAAS
+        # network interfaces. Basic configuration is supported, such as which
+        # device should be bound, the range of IP addresses, etc.
+        # Note: this may contain the special identifiers:
+        #   ${maas_net} - the first 3 octets of the ipv4 address
+        #   ${maas_ip} - the ip address of the MAAS controller 
+        node_group_ifaces:
+            - device: eth0
+              ip: 10.4.1.2
+              subnet_mask: 255.255.248.0
+              broadcast_ip: 10.4.7.255
+              router_ip: 10.4.0.1
+              static_range:
+                  low: 10.4.2.20
+                  high: 10.4.2.254
+              dynamic_range:
+                  low: 10.4.1.50
+                  high: 10.4.1.254
+
+        # Defines the physical nodes which are added to the MAAS cluster
+        # controller upon startup of the node.
+        nodes:
+            - name: node1
+              tags: physical
+              architecture: amd64/generic
+              mac_addresses:
+                  - "00:1e:67:e0:0a:4a"
+                  - "00:1e:67:e0:0a:4b"
+                  - "00:1e:67:d0:9a:10"
+                  - "00:1e:67:d0:9a:11"
+              power:
+                  type: ipmi
+                  address: 10.4.2.8
+                  user: root
+                  pass: root
+                  driver: LAN_2_0
+#              sticky_ip_address:
+#                  mac_address: "38:63:bb:43:b8:9c"
+#                  requested_address: 192.168.122.5
+                
+            - name: node2
+              tags: physical
+              architecture: amd64/generic
+              mac_addresses:
+                  - "00:1e:67:e0:08:b0"
+                  - "00:1e:67:e0:08:b1"
+                  - "00:1e:67:d0:99:ee"
+                  - "00:1e:67:d0:99:ef"
+              power:
+                  type: ipmi
+                  address: 10.4.2.9
+                  user: root
+                  pass: root
+                  driver: LAN_2_0
+#              sticky_ip_address:
+#                  mac_address: "38:63:bb:43:b8:9c"
+#                  requested_address: 192.168.122.5
+
+            - name: node3
+              tags: physical
+              architecture: amd64/generic
+              mac_addresses:
+                  - "00:1e:67:e0:08:7e"
+                  - "00:1e:67:e0:08:7f"
+                  - "00:1e:67:c2:23:d8"
+                  - "00:1e:67:c2:23:d9"
+              power:
+                  type: ipmi
+                  address: 10.4.2.7
+                  user: root
+                  pass: root
+                  driver: LAN_2_0
+#              sticky_ip_address:
+#                  mac_address: "38:63:bb:43:b8:9c"
+#                  requested_address: 192.168.122.5
+
+            - name: node4
+              tags: physical
+              architecture: amd64/generic
+              mac_addresses:
+                  - "00:1e:67:cf:b8:92"
+                  - "00:1e:67:cf:b8:93"
+                  - "00:1e:67:d0:9b:0c"
+                  - "00:1e:67:d0:9b:0d"
+              power:
+                  type: ipmi
+                  address: 10.4.2.10
+                  user: root
+                  pass: root
+                  driver: LAN_2_0
+#              sticky_ip_address:
+#                  mac_address: "38:63:bb:43:b8:9c"
+#                  requested_address: 192.168.122.5
+
+    # Contains the virtual machine parameters for creating the Juju bootstrap
+    # node virtual machine
+    juju-bootstrap:
+        name: bootstrap
+        interfaces: ['bridge=br0,model=virtio']
+        memory: 4096
+        vcpus: 2
+        arch: amd64
+        pool: default
+        disk_size: 120G
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 6373f2d0..9ebf5fc2 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -7,10 +7,10 @@ openstack-services:
       constraints: tags=physical
     neutron-gateway:
       branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
-      constraints: tags=neutron
       options:
         plugin: ovs-odl
         instance-mtu: 1400
+      to: ubuntu=0
     nova-compute:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
       num_units: 2
@@ -32,7 +32,7 @@ openstack-services:
     odl-controller:
       branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
       options:
-        install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
       to: lxc:ubuntu=0
     openvswitch-odl:
       branch: lp:~alai/charms/trusty/openvswitch-odl/trunk
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 3c490d71..a5d1f08e 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -6,10 +6,10 @@ openstack-services:
       constraints: tags=physical
     neutron-gateway:
       branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
-      constraints: tags=neutron
       options:
         plugin: ovs-odl
         instance-mtu: 1400
+      to: ubuntu=0
     nova-compute:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
       num_units: 2
@@ -31,7 +31,7 @@ openstack-services:
     odl-controller:
       branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
       options:
-        install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
       to: lxc:ubuntu=0
     openvswitch-odl:
       branch: lp:~alai/charms/trusty/openvswitch-odl/trunk
diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index 6373f2d0..dae7a36c 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -7,10 +7,11 @@ openstack-services:
       constraints: tags=physical
     neutron-gateway:
       branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
-      constraints: tags=neutron
+      #constraints: tags=neutron
       options:
         plugin: ovs-odl
         instance-mtu: 1400
+      to: ubuntu=0
     nova-compute:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
       num_units: 2
@@ -32,7 +33,7 @@ openstack-services:
     odl-controller:
       branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
       options:
-        install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
       to: lxc:ubuntu=0
     openvswitch-odl:
       branch: lp:~alai/charms/trusty/openvswitch-odl/trunk