Merge lp:~thomnico/orange-box/newnet into lp:orange-box

[Nicolas Thomas]

Tested version of the orange-box package to work with the new network setup.

Active review/test needed.

[Zhanglei Mao (zhanglei-mao)]

Test it on Ubuntu 14.04.2 X64 server + MAAS 1.8 and Ubuntu 14.04.2 X64 Desktop + MAAS 1.7, both are stop at:

+ run-one-until-success maas admin node-group-interface update 3b3deac8-ce39-4fb6-b0a2-74ab32474fce br0 ip_range_low=172.27.9.1 ip_range_high=172.27.9.254 static_ip_range_low=172.27.10.1 static_ip_range_high=172.27.10.254 management=2 broadcast_ip=172.27.11.255 router_ip=172.27.8.1
Not FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot Found^Cdpkg: error processing package orange-box (--configure):
subprocess installed post-installation script was interrupted
E: Sub-process /usr/bin/dpkg exited unexpectedly
W: Operation was interrupted before it could finish

The problem seems of matching in "br0" and "eth1"

ubuntu@OrangeBox8:~$ sudo maas admin node-groups list
Success.
Machine-readable output follows:
[
    {
        "cluster_name": "Cluster master",
        "status": 1,
        "name": "maas",
        "uuid": "3b3deac8-ce39-4fb6-b0a2-74ab32474fce"
    }
]
ubuntu@OrangeBox8:~$ sudo maas admin node-group-interfaces list 3b3deac8-ce39-4fb6-b0a2-74ab32474fce
Success.
Machine-readable output follows:
[
    {
        "ip_range_high": null,
        "ip_range_low": null,
        "broadcast_ip": "172.27.255.255",
        "static_ip_range_low": null,
        "name": "eth1",
        "ip": "172.27.252.8",
        "subnet_mask": "255.255.252.0",
        "management": 0,
        "static_ip_range_high": null,
        "interface": "eth1"
    }
]

It cab update as below:

ubuntu@OrangeBox8:~$ sudo maas admin node-group-interface update 3b3deac8-ce39-4fb6-b0a2-74ab32474fce eth1 ip_range_low=172.27.9.1 ip_range_high=172.27.9.254 static_ip_range_low=172.27.10.1 static_ip_range_high=172.27.10.254 management=2 broadcast_ip=172.27.11.255 router_ip=172.27.8.1
{"ip_range_high": ["172.27.9.254 not in the 172.27.252.0/22 network"], "ip_range_low": ["172.27.9.1 not in the 172.27.252.0/22 network"], "broadcast_ip": ["172.27.11.255 not in the 172.27.252.0/22 network"], "static_ip_range_low": ["172.27.10.1 not in the 172.27.252.0/22 network"], "router_ip": ["172.27.8.1 not in the 172.27.252.0/22 network"], "static_ip_range_high": ["172.27.10.254 not in the 172.27.252.0/22 network"]}

The br0 interface seem correct, but I didn't command which created the interface listed by the command of '$ sudo maas admin node-group-interfaces list 3b3deac8-ce39-4fb6-b0a2-74ab32474fce'

[Nicolas Thomas (thomnico)]

Mao,

You network setup seems odd and not align with our rework doc.

Please purge Maas package reboot and restart if you can or send us your
network configuration.

Le dim. 14 juin 2015 07:00, Zhanglei Mao <email address hidden> a
écrit :

> Test it on Ubuntu 14.04.2 X64 server + MAAS 1.8 and Ubuntu 14.04.2 X64
> Desktop + MAAS 1.7, both are stop at:
>
> + run-one-until-success maas admin node-group-interface update
> 3b3deac8-ce39-4fb6-b0a2-74ab32474fce br0 ip_range_low=172.27.9.1
> ip_range_high=172.27.9.254 static_ip_range_low=172.27.10.1
> static_ip_range_high=172.27.10.254 management=2 broadcast_ip=172.27.11.255
> router_ip=172.27.8.1
> Not FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot
> FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot FoundNot
> FoundNot FoundNot FoundNot FoundNot Found^Cdpkg: error processing package
> orange-box (--configure):
> subprocess installed post-installation script was interrupted
> E: Sub-process /usr/bin/dpkg exited unexpectedly
> W: Operation was interrupted before it could finish
>
> The problem seems of matching in "br0" and "eth1"
>
> ubuntu@OrangeBox8:~$ sudo maas admin node-groups list
> Success.
> Machine-readable output follows:
> [
> {
> "cluster_name": "Cluster master",
> "status": 1,
> "name": "maas",
> "uuid": "3b3deac8-ce39-4fb6-b0a2-74ab32474fce"
> }
> ]
> ubuntu@OrangeBox8:~$ sudo maas admin node-group-interfaces list
> 3b3deac8-ce39-4fb6-b0a2-74ab32474fce
> Success.
> Machine-readable output follows:
> [
> {
> "ip_range_high": null,
> "ip_range_low": null,
> "broadcast_ip": "172.27.255.255",
> "static_ip_range_low": null,
> "name": "eth1",
> "ip": "172.27.252.8",
> "subnet_mask": "255.255.252.0",
> "management": 0,
> "static_ip_range_high": null,
> "interface": "eth1"
> }
> ]
>
> It cab update as below:
>
> ubuntu@OrangeBox8:~$ sudo maas admin node-group-interface update
> 3b3deac8-ce39-4fb6-b0a2-74ab32474fce eth1 ip_range_low=172.27.9.1
> ip_range_high=172.27.9.254 static_ip_range_low=172.27.10.1
> static_ip_range_high=172.27.10.254 management=2 broadcast_ip=172.27.11.255
> router_ip=172.27.8.1
> {"ip_range_high": ["172.27.9.254 not in the 172.27.252.0/22 network"],
> "ip_range_low": ["172.27.9.1 not in the 172.27.252.0/22 network"],
> "broadcast_ip": ["172.27.11.255 not in the 172.27.252.0/22 network"],
> "static_ip_range_low": ["172.27.10.1 not in the 172.27.252.0/22
> network"], "router_ip": ["172.27.8.1 not in the 172.27.252.0/22
> network"], "static_ip_range_high": ["172.27.10.254 not in the
> 172.27.252.0/22 network"]}
>
> The br0 interface seem correct, but I didn't command which created the
> interface listed by the command of '$ sudo maas admin node-group-interfaces
> list 3b3deac8-ce39-4fb6-b0a2-74ab32474fce'
>
> --
> https://code.launchpad.net/~thomnico/orange-box/newnet/+merge/261775
> You are the owner of lp:~thomnico/orange-box/newnet.
>

[Zhanglei Mao (zhanglei-mao)]

Nicolas,

I agree. It should be caused by the problem of my network. Here is output
of ifconfig and brctl. The eth1 is my usb-lan-card port, eth0 is system
board lan-card port. I configured eth1 with 172.27.252.8 and was able to
reach internet via gateway of 172.27.252.1 before running #apt-get install
orange-box.

ubuntu@OrangeBox8:~$ ifconfig
br0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
          inet addr:172.27.8.1 Bcast:172.27.11.255 Mask:255.255.252.0
          inet6 addr: fe80::eea8:6bff:fefe:1822/64 Scope:Link
          UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
          TX packets:54 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:0
          RX bytes:0 (0.0 B) TX bytes:7671 (7.6 KB)

eth0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
          UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
          TX packets:56 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:1000
          RX bytes:0 (0.0 B) TX bytes:8015 (8.0 KB)
          Interrupt:20 Memory:f7d00000-f7d20000

eth1 Link encap:Ethernet HWaddr 00:24:9b:0e:1e:ad
          inet addr:172.27.252.8 Bcast:172.27.255.255 Mask:255.255.252.0
          inet6 addr: fe80::224:9bff:fe0e:1ead/64 Scope:Link
          UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
          RX packets:9734872 errors:0 dropped:0 overruns:0 frame:0
          TX packets:5699043 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:1000
          RX bytes:14599384523 (14.5 GB) TX bytes:443971610 (443.9 MB)

lo Link encap:Local Loopback
          inet addr:127.0.0.1 Mask:255.0.0.0
          inet6 addr: ::1/128 Scope:Host
          UP LOOPBACK RUNNING MTU:65536 Metric:1
          RX packets:107516 errors:0 dropped:0 overruns:0 frame:0
          TX packets:107516 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:0
          RX bytes:27072199 (27.0 MB) TX bytes:27072199 (27.0 MB)

virbr0 Link encap:Ethernet HWaddr da:cf:d4:c0:b0:b7
          inet addr:192.168.122.1 Bcast:192.168.122.255 Mask:255.255.255.0
          UP BROADCAST MULTICAST MTU:1500 Metric:1
          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:0
          RX bytes:0 (0.0 B) TX bytes:0 (0.0 B)

ubuntu@OrangeBox8:~$

ubuntu@OrangeBox8:~$ brctl show
bridge name bridge id STP enabled interfaces
br0 8000.eca86bfe1822 no eth0
virbr0 8000.000000000000 yes

thanks,
Mao

On Sun, Jun 14, 2015 at 5:15 PM, Nicolas Thomas <
<email address hidden>> wrote:

> Mao,
>
> You network setup seems odd and not align with our rework doc.
>
> Please purge Maas package reboot and restart if you can or send us your
> network configuration.
>
> Le dim. 14 juin 2015 07:00, Zhanglei Mao <email address hidden> a
> écrit :
>
> > Test it on Ubuntu 14.04.2 X64 server + MAAS 1.8 and Ubuntu 14.04.2 X64
> > Desktop + MAAS 1.7, both are stop at:
> >
> > + run-o...

[Nicolas Thomas (thomnico)]

Hello Mao,

With a laptop keyboard (not a phone) this time:

Your network setup should show em1 and not eth0 .. (might not be related).

Can you run :
sudo biosdevname -i eth1

And rerun the install package to confirm ??

My Box seems totally dead now (node0) so difficult to confirm

On 14/06/2015 12:54, Zhanglei Mao wrote:
> Nicolas,
>
> I agree. It should be caused by the problem of my network. Here is output
> of ifconfig and brctl. The eth1 is my usb-lan-card port, eth0 is system
> board lan-card port. I configured eth1 with 172.27.252.8 and was able to
> reach internet via gateway of 172.27.252.1 before running #apt-get install
> orange-box.
>
> ubuntu@OrangeBox8:~$ ifconfig
> br0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
> inet addr:172.27.8.1 Bcast:172.27.11.255 Mask:255.255.252.0
> inet6 addr: fe80::eea8:6bff:fefe:1822/64 Scope:Link
> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
> TX packets:54 errors:0 dropped:0 overruns:0 carrier:0
> collisions:0 txqueuelen:0
> RX bytes:0 (0.0 B) TX bytes:7671 (7.6 KB)
>
> eth0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
> TX packets:56 errors:0 dropped:0 overruns:0 carrier:0
> collisions:0 txqueuelen:1000
> RX bytes:0 (0.0 B) TX bytes:8015 (8.0 KB)
> Interrupt:20 Memory:f7d00000-f7d20000
>
> eth1 Link encap:Ethernet HWaddr 00:24:9b:0e:1e:ad
> inet addr:172.27.252.8 Bcast:172.27.255.255 Mask:255.255.252.0
> inet6 addr: fe80::224:9bff:fe0e:1ead/64 Scope:Link
> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> RX packets:9734872 errors:0 dropped:0 overruns:0 frame:0
> TX packets:5699043 errors:0 dropped:0 overruns:0 carrier:0
> collisions:0 txqueuelen:1000
> RX bytes:14599384523 (14.5 GB) TX bytes:443971610 (443.9 MB)
>
> lo Link encap:Local Loopback
> inet addr:127.0.0.1 Mask:255.0.0.0
> inet6 addr: ::1/128 Scope:Host
> UP LOOPBACK RUNNING MTU:65536 Metric:1
> RX packets:107516 errors:0 dropped:0 overruns:0 frame:0
> TX packets:107516 errors:0 dropped:0 overruns:0 carrier:0
> collisions:0 txqueuelen:0
> RX bytes:27072199 (27.0 MB) TX bytes:27072199 (27.0 MB)
>
> virbr0 Link encap:Ethernet HWaddr da:cf:d4:c0:b0:b7
> inet addr:192.168.122.1 Bcast:192.168.122.255 Mask:255.255.255.0
> UP BROADCAST MULTICAST MTU:1500 Metric:1
> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
> TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
> collisions:0 txqueuelen:0
> RX bytes:0 (0.0 B) TX bytes:0 (0.0 B)
>
> ubuntu@OrangeBox8:~$
>
> ubuntu@OrangeBox8:~$ brctl show
> bridge name bridge id STP enabled interfaces
> br0 8000.eca86bfe1822 no eth0
> virbr0 8000.000000000000 yes
>
> thanks,
> Mao
>
> On Sun, Jun 14, 2015 at 5:15 P...

[lp:~thomnico/orange-box/newnet]

540. By Nicolas Thomas on 2015-06-15

* Add biosdevname cmd in scripts
* Add a check/heal for VMs powermanagement ssh keys
*

[Nicolas Thomas (thomnico)]

Mao / all

I upload a 2.9 version to experimental ppa that should fix the pb and
the VM power issues we might face time to time..

Will restart a review on that one

On Mon, Jun 15, 2015 at 9:12 AM, Nicolas Thomas
<email address hidden> wrote:
> Hello Mao,
>
> With a laptop keyboard (not a phone) this time:
>
> Your network setup should show em1 and not eth0 .. (might not be related).
>
> Can you run :
> sudo biosdevname -i eth1
>
> And rerun the install package to confirm ??
>
> My Box seems totally dead now (node0) so difficult to confirm
>
>
> On 14/06/2015 12:54, Zhanglei Mao wrote:
>> Nicolas,
>>
>> I agree. It should be caused by the problem of my network. Here is output
>> of ifconfig and brctl. The eth1 is my usb-lan-card port, eth0 is system
>> board lan-card port. I configured eth1 with 172.27.252.8 and was able to
>> reach internet via gateway of 172.27.252.1 before running #apt-get install
>> orange-box.
>>
>> ubuntu@OrangeBox8:~$ ifconfig
>> br0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
>> inet addr:172.27.8.1 Bcast:172.27.11.255 Mask:255.255.252.0
>> inet6 addr: fe80::eea8:6bff:fefe:1822/64 Scope:Link
>> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
>> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
>> TX packets:54 errors:0 dropped:0 overruns:0 carrier:0
>> collisions:0 txqueuelen:0
>> RX bytes:0 (0.0 B) TX bytes:7671 (7.6 KB)
>>
>> eth0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
>> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
>> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
>> TX packets:56 errors:0 dropped:0 overruns:0 carrier:0
>> collisions:0 txqueuelen:1000
>> RX bytes:0 (0.0 B) TX bytes:8015 (8.0 KB)
>> Interrupt:20 Memory:f7d00000-f7d20000
>>
>> eth1 Link encap:Ethernet HWaddr 00:24:9b:0e:1e:ad
>> inet addr:172.27.252.8 Bcast:172.27.255.255 Mask:255.255.252.0
>> inet6 addr: fe80::224:9bff:fe0e:1ead/64 Scope:Link
>> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
>> RX packets:9734872 errors:0 dropped:0 overruns:0 frame:0
>> TX packets:5699043 errors:0 dropped:0 overruns:0 carrier:0
>> collisions:0 txqueuelen:1000
>> RX bytes:14599384523 (14.5 GB) TX bytes:443971610 (443.9 MB)
>>
>> lo Link encap:Local Loopback
>> inet addr:127.0.0.1 Mask:255.0.0.0
>> inet6 addr: ::1/128 Scope:Host
>> UP LOOPBACK RUNNING MTU:65536 Metric:1
>> RX packets:107516 errors:0 dropped:0 overruns:0 frame:0
>> TX packets:107516 errors:0 dropped:0 overruns:0 carrier:0
>> collisions:0 txqueuelen:0
>> RX bytes:27072199 (27.0 MB) TX bytes:27072199 (27.0 MB)
>>
>> virbr0 Link encap:Ethernet HWaddr da:cf:d4:c0:b0:b7
>> inet addr:192.168.122.1 Bcast:192.168.122.255 Mask:255.255.255.0
>> UP BROADCAST MULTICAST MTU:1500 Metric:1
>> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
>> TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
>> collisions:0 txqueuelen:...

[lp:~thomnico/orange-box/newnet]

541. By Nicolas Thomas on 2015-06-15

releasing 2.8~ppa1

542. By Nicolas Thomas on 2015-06-15

releasing 2.9~ppa1

543. By Nicolas Thomas on 2015-06-15

Update source/format so zbr-buildpackages works
make ssh works correctly in add-virutal-nodes

modified:
  debian/source/format
  usr/bin/orange-box-add-virtual-nodes

544. By Nicolas Thomas on 2015-06-15

releasing 2.9~ppa2

545. By Nicolas Thomas on 2015-06-15

updates on ssh maas to ubuntu automation

modified:
  debian/changelog
  usr/bin/orange-box-add-virtual-nodes

[Zhanglei Mao (zhanglei-mao)]

Nicolas,

No sure I have used the new version you had uploaded. I test it again, it
stop at same step of "Not Found". I check the GUI, both the eth1 network
and eth1 interface were created. I delete it from the GUI and rerun the
'dpkg --configure -a' again, still get "Not Found"

In the MAAS document, this interface seems was created automatically. So it
should related to my network. Here is my rough steps for test:
1)To setup 14.04.2 X86 Desktop without network from usb stick. The hostname
set to OrangeBox8 and region is to Hongkong.
2)After install finish, I mount /srv and change locale and set eth1 static
ip via network manager.
3)install biosnamedev and reboot. The eth0 will be em1 now.
4)Add rep and install ornage-box as below:
sudo apt-add-repository ppa:maas-maintainers/stable
sudo add-apt-repository ppa:orange-box/experimental
sudo apt-add-repository ppa:juju/stable
sudo apt-get update
sudo apt-get -V install orange-box | tee /var/log/$(hostname)_log.txt

thanks,
Mao

On Mon, Jun 15, 2015 at 5:00 PM, Nicolas Thomas <
<email address hidden>> wrote:

> Mao / all
>
> I upload a 2.9 version to experimental ppa that should fix the pb and
> the VM power issues we might face time to time..
>
> Will restart a review on that one
>
>
> On Mon, Jun 15, 2015 at 9:12 AM, Nicolas Thomas
> <email address hidden> wrote:
> > Hello Mao,
> >
> > With a laptop keyboard (not a phone) this time:
> >
> > Your network setup should show em1 and not eth0 .. (might not be
> related).
> >
> > Can you run :
> > sudo biosdevname -i eth1
> >
> > And rerun the install package to confirm ??
> >
> > My Box seems totally dead now (node0) so difficult to confirm
> >
> >
> > On 14/06/2015 12:54, Zhanglei Mao wrote:
> >> Nicolas,
> >>
> >> I agree. It should be caused by the problem of my network. Here is
> output
> >> of ifconfig and brctl. The eth1 is my usb-lan-card port, eth0 is system
> >> board lan-card port. I configured eth1 with 172.27.252.8 and was able to
> >> reach internet via gateway of 172.27.252.1 before running #apt-get
> install
> >> orange-box.
> >>
> >> ubuntu@OrangeBox8:~$ ifconfig
> >> br0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
> >> inet addr:172.27.8.1 Bcast:172.27.11.255 Mask:255.255.252.0
> >> inet6 addr: fe80::eea8:6bff:fefe:1822/64 Scope:Link
> >> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> >> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
> >> TX packets:54 errors:0 dropped:0 overruns:0 carrier:0
> >> collisions:0 txqueuelen:0
> >> RX bytes:0 (0.0 B) TX bytes:7671 (7.6 KB)
> >>
> >> eth0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
> >> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> >> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
> >> TX packets:56 errors:0 dropped:0 overruns:0 carrier:0
> >> collisions:0 txqueuelen:1000
> >> RX bytes:0 (0.0 B) TX bytes:8015 (8.0 KB)
> >> Interrupt:20 Memory:f7d00000-f7d20000
> >>
> >> eth1 Link encap:Ethernet HWaddr 00:24:9b:0e:1e:ad
> >> inet addr:172.27.252.8 Bcast:172.27.255.255
> Mask:255.255.252.0...

[Nicolas Thomas (thomnico)]

You should not have eth0 !

Please purge maas, do an update and reinstall to confirm .

On Mon, Jun 15, 2015 at 3:54 PM, Zhanglei Mao
<email address hidden> wrote:
> Nicolas,
>
> No sure I have used the new version you had uploaded. I test it again, it
> stop at same step of "Not Found". I check the GUI, both the eth1 network
> and eth1 interface were created. I delete it from the GUI and rerun the
> 'dpkg --configure -a' again, still get "Not Found"
>
> In the MAAS document, this interface seems was created automatically. So it
> should related to my network. Here is my rough steps for test:
> 1)To setup 14.04.2 X86 Desktop without network from usb stick. The hostname
> set to OrangeBox8 and region is to Hongkong.
> 2)After install finish, I mount /srv and change locale and set eth1 static
> ip via network manager.
> 3)install biosnamedev and reboot. The eth0 will be em1 now.
> 4)Add rep and install ornage-box as below:
> sudo apt-add-repository ppa:maas-maintainers/stable
> sudo add-apt-repository ppa:orange-box/experimental
> sudo apt-add-repository ppa:juju/stable
> sudo apt-get update
> sudo apt-get -V install orange-box | tee /var/log/$(hostname)_log.txt
>
>
> thanks,
> Mao
>
> On Mon, Jun 15, 2015 at 5:00 PM, Nicolas Thomas <
> <email address hidden>> wrote:
>
>> Mao / all
>>
>> I upload a 2.9 version to experimental ppa that should fix the pb and
>> the VM power issues we might face time to time..
>>
>> Will restart a review on that one
>>
>>
>> On Mon, Jun 15, 2015 at 9:12 AM, Nicolas Thomas
>> <email address hidden> wrote:
>> > Hello Mao,
>> >
>> > With a laptop keyboard (not a phone) this time:
>> >
>> > Your network setup should show em1 and not eth0 .. (might not be
>> related).
>> >
>> > Can you run :
>> > sudo biosdevname -i eth1
>> >
>> > And rerun the install package to confirm ??
>> >
>> > My Box seems totally dead now (node0) so difficult to confirm
>> >
>> >
>> > On 14/06/2015 12:54, Zhanglei Mao wrote:
>> >> Nicolas,
>> >>
>> >> I agree. It should be caused by the problem of my network. Here is
>> output
>> >> of ifconfig and brctl. The eth1 is my usb-lan-card port, eth0 is system
>> >> board lan-card port. I configured eth1 with 172.27.252.8 and was able to
>> >> reach internet via gateway of 172.27.252.1 before running #apt-get
>> install
>> >> orange-box.
>> >>
>> >> ubuntu@OrangeBox8:~$ ifconfig
>> >> br0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
>> >> inet addr:172.27.8.1 Bcast:172.27.11.255 Mask:255.255.252.0
>> >> inet6 addr: fe80::eea8:6bff:fefe:1822/64 Scope:Link
>> >> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
>> >> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
>> >> TX packets:54 errors:0 dropped:0 overruns:0 carrier:0
>> >> collisions:0 txqueuelen:0
>> >> RX bytes:0 (0.0 B) TX bytes:7671 (7.6 KB)
>> >>
>> >> eth0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
>> >> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
>> >> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
>> >> TX packets:56 errors:0 dropped:0 overruns:0 carrier:0
>> >> collisions:0 tx...

[Zhanglei Mao (zhanglei-mao)]

Yes, no eth0 anymore. I gonna test it again Tomorrow.
2015年6月15日 下午10:09于 "Nicolas Thomas" <email address hidden>写道：

> You should not have eth0 !
>
> Please purge maas, do an update and reinstall to confirm .
>
> On Mon, Jun 15, 2015 at 3:54 PM, Zhanglei Mao
> <email address hidden> wrote:
> > Nicolas,
> >
> > No sure I have used the new version you had uploaded. I test it again, it
> > stop at same step of "Not Found". I check the GUI, both the eth1 network
> > and eth1 interface were created. I delete it from the GUI and rerun the
> > 'dpkg --configure -a' again, still get "Not Found"
> >
> > In the MAAS document, this interface seems was created automatically. So
> it
> > should related to my network. Here is my rough steps for test:
> > 1)To setup 14.04.2 X86 Desktop without network from usb stick. The
> hostname
> > set to OrangeBox8 and region is to Hongkong.
> > 2)After install finish, I mount /srv and change locale and set eth1
> static
> > ip via network manager.
> > 3)install biosnamedev and reboot. The eth0 will be em1 now.
> > 4)Add rep and install ornage-box as below:
> > sudo apt-add-repository ppa:maas-maintainers/stable
> > sudo add-apt-repository ppa:orange-box/experimental
> > sudo apt-add-repository ppa:juju/stable
> > sudo apt-get update
> > sudo apt-get -V install orange-box | tee /var/log/$(hostname)_log.txt
> >
> >
> > thanks,
> > Mao
> >
> > On Mon, Jun 15, 2015 at 5:00 PM, Nicolas Thomas <
> > <email address hidden>> wrote:
> >
> >> Mao / all
> >>
> >> I upload a 2.9 version to experimental ppa that should fix the pb and
> >> the VM power issues we might face time to time..
> >>
> >> Will restart a review on that one
> >>
> >>
> >> On Mon, Jun 15, 2015 at 9:12 AM, Nicolas Thomas
> >> <email address hidden> wrote:
> >> > Hello Mao,
> >> >
> >> > With a laptop keyboard (not a phone) this time:
> >> >
> >> > Your network setup should show em1 and not eth0 .. (might not be
> >> related).
> >> >
> >> > Can you run :
> >> > sudo biosdevname -i eth1
> >> >
> >> > And rerun the install package to confirm ??
> >> >
> >> > My Box seems totally dead now (node0) so difficult to confirm
> >> >
> >> >
> >> > On 14/06/2015 12:54, Zhanglei Mao wrote:
> >> >> Nicolas,
> >> >>
> >> >> I agree. It should be caused by the problem of my network. Here is
> >> output
> >> >> of ifconfig and brctl. The eth1 is my usb-lan-card port, eth0 is
> system
> >> >> board lan-card port. I configured eth1 with 172.27.252.8 and was
> able to
> >> >> reach internet via gateway of 172.27.252.1 before running #apt-get
> >> install
> >> >> orange-box.
> >> >>
> >> >> ubuntu@OrangeBox8:~$ ifconfig
> >> >> br0 Link encap:Ethernet HWaddr ec:a8:6b:fe:18:22
> >> >> inet addr:172.27.8.1 Bcast:172.27.11.255
> Mask:255.255.252.0
> >> >> inet6 addr: fe80::eea8:6bff:fefe:1822/64 Scope:Link
> >> >> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> >> >> RX packets:0 errors:0 dropped:0 overruns:0 frame:0
> >> >> TX packets:54 errors:0 dropped:0 overruns:0 carrier:0
> >> >> collisions:0 txqueuelen:0
> >> >> RX bytes:0 (0.0 B) TX bytes:7671 (7.6 KB)
> >> >>
> ...

[Zhanglei Mao (zhanglei-mao)]

Nicolas,

I though the right logic might as:
1) preinst script of the orange-box -- adjust network according
2) maas packages install --auto create mas-cluster-interfaces
3) postinst script of the orange-box

But it was actually happened as:
1)maas pacakge install ( in case of deps by ornage-box)
2)preinst script of the orange-box
3)postinst script of the orange-box

So this is cause that unnecessary interfaces was added by maas during
install. There seems no easy method to let network setup scripts runs
before the maas. So we may just delete all interface added by maas
automatically and create br0 interface inside the orange-box postinst
scripts.

thanks,
Mao

On Mon, Jun 15, 2015 at 10:21 PM, Zhanglei Mao <email address hidden>
wrote:

> Yes, no eth0 anymore. I gonna test it again Tomorrow.
> 2015年6月15日 下午10:09于 "Nicolas Thomas" <email address hidden>写道：
>
> > You should not have eth0 !
> >
> > Please purge maas, do an update and reinstall to confirm .
> >
> > On Mon, Jun 15, 2015 at 3:54 PM, Zhanglei Mao
> > <email address hidden> wrote:
> > > Nicolas,
> > >
> > > No sure I have used the new version you had uploaded. I test it again,
> it
> > > stop at same step of "Not Found". I check the GUI, both the eth1
> network
> > > and eth1 interface were created. I delete it from the GUI and rerun the
> > > 'dpkg --configure -a' again, still get "Not Found"
> > >
> > > In the MAAS document, this interface seems was created automatically.
> So
> > it
> > > should related to my network. Here is my rough steps for test:
> > > 1)To setup 14.04.2 X86 Desktop without network from usb stick. The
> > hostname
> > > set to OrangeBox8 and region is to Hongkong.
> > > 2)After install finish, I mount /srv and change locale and set eth1
> > static
> > > ip via network manager.
> > > 3)install biosnamedev and reboot. The eth0 will be em1 now.
> > > 4)Add rep and install ornage-box as below:
> > > sudo apt-add-repository ppa:maas-maintainers/stable
> > > sudo add-apt-repository ppa:orange-box/experimental
> > > sudo apt-add-repository ppa:juju/stable
> > > sudo apt-get update
> > > sudo apt-get -V install orange-box | tee /var/log/$(hostname)_log.txt
> > >
> > >
> > > thanks,
> > > Mao
> > >
> > > On Mon, Jun 15, 2015 at 5:00 PM, Nicolas Thomas <
> > > <email address hidden>> wrote:
> > >
> > >> Mao / all
> > >>
> > >> I upload a 2.9 version to experimental ppa that should fix the pb and
> > >> the VM power issues we might face time to time..
> > >>
> > >> Will restart a review on that one
> > >>
> > >>
> > >> On Mon, Jun 15, 2015 at 9:12 AM, Nicolas Thomas
> > >> <email address hidden> wrote:
> > >> > Hello Mao,
> > >> >
> > >> > With a laptop keyboard (not a phone) this time:
> > >> >
> > >> > Your network setup should show em1 and not eth0 .. (might not be
> > >> related).
> > >> >
> > >> > Can you run :
> > >> > sudo biosdevname -i eth1
> > >> >
> > >> > And rerun the install package to confirm ??
> > >> >
> > >> > My Box seems totally dead now (node0) so difficult to confirm
> > >> >
> > >> >
> > >> > On 14/06/2015 12:54, Zhanglei Mao wrote:
> > >> >> Nicolas,
> > >> >>
> > >> >> I agree. It should be caused by the prob...

[Nicolas Thomas (thomnico)]

That was not the intent to change behavior yet .. intent is to have a
common baseline for enhancing as a team.

Procedure is : orange-box-purge-everything , reboot , apt-get install orange-box

If you don't like the sequence propose a branch :)

On Wed, Jun 17, 2015 at 4:12 PM, Zhanglei Mao
<email address hidden> wrote:
> Nicolas,
>
> I though the right logic might as:
> 1) preinst script of the orange-box -- adjust network according
> 2) maas packages install --auto create mas-cluster-interfaces
> 3) postinst script of the orange-box
>
> But it was actually happened as:
> 1)maas pacakge install ( in case of deps by ornage-box)
> 2)preinst script of the orange-box
> 3)postinst script of the orange-box
>
> So this is cause that unnecessary interfaces was added by maas during
> install. There seems no easy method to let network setup scripts runs
> before the maas. So we may just delete all interface added by maas
> automatically and create br0 interface inside the orange-box postinst
> scripts.
>
> thanks,
> Mao
>
>
> On Mon, Jun 15, 2015 at 10:21 PM, Zhanglei Mao <email address hidden>
> wrote:
>
>> Yes, no eth0 anymore. I gonna test it again Tomorrow.
>> 2015年6月15日 下午10:09于 "Nicolas Thomas" <email address hidden>写道：
>>
>> > You should not have eth0 !
>> >
>> > Please purge maas, do an update and reinstall to confirm .
>> >
>> > On Mon, Jun 15, 2015 at 3:54 PM, Zhanglei Mao
>> > <email address hidden> wrote:
>> > > Nicolas,
>> > >
>> > > No sure I have used the new version you had uploaded. I test it again,
>> it
>> > > stop at same step of "Not Found". I check the GUI, both the eth1
>> network
>> > > and eth1 interface were created. I delete it from the GUI and rerun the
>> > > 'dpkg --configure -a' again, still get "Not Found"
>> > >
>> > > In the MAAS document, this interface seems was created automatically.
>> So
>> > it
>> > > should related to my network. Here is my rough steps for test:
>> > > 1)To setup 14.04.2 X86 Desktop without network from usb stick. The
>> > hostname
>> > > set to OrangeBox8 and region is to Hongkong.
>> > > 2)After install finish, I mount /srv and change locale and set eth1
>> > static
>> > > ip via network manager.
>> > > 3)install biosnamedev and reboot. The eth0 will be em1 now.
>> > > 4)Add rep and install ornage-box as below:
>> > > sudo apt-add-repository ppa:maas-maintainers/stable
>> > > sudo add-apt-repository ppa:orange-box/experimental
>> > > sudo apt-add-repository ppa:juju/stable
>> > > sudo apt-get update
>> > > sudo apt-get -V install orange-box | tee /var/log/$(hostname)_log.txt
>> > >
>> > >
>> > > thanks,
>> > > Mao
>> > >
>> > > On Mon, Jun 15, 2015 at 5:00 PM, Nicolas Thomas <
>> > > <email address hidden>> wrote:
>> > >
>> > >> Mao / all
>> > >>
>> > >> I upload a 2.9 version to experimental ppa that should fix the pb and
>> > >> the VM power issues we might face time to time..
>> > >>
>> > >> Will restart a review on that one
>> > >>
>> > >>
>> > >> On Mon, Jun 15, 2015 at 9:12 AM, Nicolas Thomas
>> > >> <email address hidden> wrote:
>> > >> > Hello Mao,
>> > >> >
>> > >> > With a laptop keyboard (not a phone) this time:
>> > >> >
>> > >> > Your ne...

[Zhanglei Mao (zhanglei-mao)]

Procedure is : orange-box-purge-everything , reboot , apt-get install
orange-box

Yes, it works at last. But I have to say it is not easy.

The rough steps are:
sudo apt-get purge maas-cluster-controller
sudo apt-get purge maas-region-controller python-django-maas
sudo apt-get purge maas-proxy
sudo apt-get purge maas orange-box
sudo apt-get autoremove
#reboot
sudo apt-get install

during the process you may need to:
sudo rm /etc/apache2/conf-enabled//maas-cluster-http.conf
/etc/apache2/conf-enabled/maas-http.conf (if apache start failed)
sudo cat id_rsa.pub >> /home/ubuntu/.ssh/authorized_keys (if error caused
by not exist of this file)
sudo apachectl start (if apache restart failed)

I didn't verify above and may test it again after back from trip and share
it next week.

thanks,
Mao

On Wed, Jun 17, 2015 at 11:51 PM, Nicolas Thomas <
<email address hidden>> wrote:

> That was not the intent to change behavior yet .. intent is to have a
> common baseline for enhancing as a team.
>
> Procedure is : orange-box-purge-everything , reboot , apt-get install
> orange-box
>
> If you don't like the sequence propose a branch :)
>
>
> On Wed, Jun 17, 2015 at 4:12 PM, Zhanglei Mao
> <email address hidden> wrote:
> > Nicolas,
> >
> > I though the right logic might as:
> > 1) preinst script of the orange-box -- adjust network according
> > 2) maas packages install --auto create mas-cluster-interfaces
> > 3) postinst script of the orange-box
> >
> > But it was actually happened as:
> > 1)maas pacakge install ( in case of deps by ornage-box)
> > 2)preinst script of the orange-box
> > 3)postinst script of the orange-box
> >
> > So this is cause that unnecessary interfaces was added by maas during
> > install. There seems no easy method to let network setup scripts runs
> > before the maas. So we may just delete all interface added by maas
> > automatically and create br0 interface inside the orange-box postinst
> > scripts.
> >
> > thanks,
> > Mao
> >
> >
> > On Mon, Jun 15, 2015 at 10:21 PM, Zhanglei Mao <
> <email address hidden>>
> > wrote:
> >
> >> Yes, no eth0 anymore. I gonna test it again Tomorrow.
> >> 2015年6月15日 下午10:09于 "Nicolas Thomas" <email address hidden>写道：
> >>
> >> > You should not have eth0 !
> >> >
> >> > Please purge maas, do an update and reinstall to confirm .
> >> >
> >> > On Mon, Jun 15, 2015 at 3:54 PM, Zhanglei Mao
> >> > <email address hidden> wrote:
> >> > > Nicolas,
> >> > >
> >> > > No sure I have used the new version you had uploaded. I test it
> again,
> >> it
> >> > > stop at same step of "Not Found". I check the GUI, both the eth1
> >> network
> >> > > and eth1 interface were created. I delete it from the GUI and rerun
> the
> >> > > 'dpkg --configure -a' again, still get "Not Found"
> >> > >
> >> > > In the MAAS document, this interface seems was created
> automatically.
> >> So
> >> > it
> >> > > should related to my network. Here is my rough steps for test:
> >> > > 1)To setup 14.04.2 X86 Desktop without network from usb stick. The
> >> > hostname
> >> > > set to OrangeBox8 and region is to Hongkong.
> >> > > 2)After install finish, I mount /srv and change locale and set eth1
> >> > stat...

[Nicolas Thomas (thomnico)]

Mao

: orange-box-purge-everything , is a CLI to do the cleanup.

I disagree that reordering will change anything.. If maas is there and set
up differently than what orange box expect we must stop and raise an issue
... I do not want to end up with unnoticed change of this nature...

On a side note purging Maas is painfull due to Maas packaging and we should
log bugs on those
Le 18 juin 2015 07:00, "Zhanglei Mao" <email address hidden> a écrit :

> Procedure is : orange-box-purge-everything , reboot , apt-get install
> orange-box
>
> Yes, it works at last. But I have to say it is not easy.
>
> The rough steps are:
> sudo apt-get purge maas-cluster-controller
> sudo apt-get purge maas-region-controller python-django-maas
> sudo apt-get purge maas-proxy
> sudo apt-get purge maas orange-box
> sudo apt-get autoremove
> #reboot
> sudo apt-get install
>
> during the process you may need to:
> sudo rm /etc/apache2/conf-enabled//maas-cluster-http.conf
> /etc/apache2/conf-enabled/maas-http.conf (if apache start failed)
> sudo cat id_rsa.pub >> /home/ubuntu/.ssh/authorized_keys (if error caused
> by not exist of this file)
> sudo apachectl start (if apache restart failed)
>
> I didn't verify above and may test it again after back from trip and share
> it next week.
>
> thanks,
> Mao
>
>
> On Wed, Jun 17, 2015 at 11:51 PM, Nicolas Thomas <
> <email address hidden>> wrote:
>
> > That was not the intent to change behavior yet .. intent is to have a
> > common baseline for enhancing as a team.
> >
> > Procedure is : orange-box-purge-everything , reboot , apt-get install
> > orange-box
> >
> > If you don't like the sequence propose a branch :)
> >
> >
> > On Wed, Jun 17, 2015 at 4:12 PM, Zhanglei Mao
> > <email address hidden> wrote:
> > > Nicolas,
> > >
> > > I though the right logic might as:
> > > 1) preinst script of the orange-box -- adjust network according
> > > 2) maas packages install --auto create mas-cluster-interfaces
> > > 3) postinst script of the orange-box
> > >
> > > But it was actually happened as:
> > > 1)maas pacakge install ( in case of deps by ornage-box)
> > > 2)preinst script of the orange-box
> > > 3)postinst script of the orange-box
> > >
> > > So this is cause that unnecessary interfaces was added by maas during
> > > install. There seems no easy method to let network setup scripts runs
> > > before the maas. So we may just delete all interface added by maas
> > > automatically and create br0 interface inside the orange-box postinst
> > > scripts.
> > >
> > > thanks,
> > > Mao
> > >
> > >
> > > On Mon, Jun 15, 2015 at 10:21 PM, Zhanglei Mao <
> > <email address hidden>>
> > > wrote:
> > >
> > >> Yes, no eth0 anymore. I gonna test it again Tomorrow.
> > >> 2015年6月15日 下午10:09于 "Nicolas Thomas" <<email address hidden>
> >写道：
> > >>
> > >> > You should not have eth0 !
> > >> >
> > >> > Please purge maas, do an update and reinstall to confirm .
> > >> >
> > >> > On Mon, Jun 15, 2015 at 3:54 PM, Zhanglei Mao
> > >> > <email address hidden> wrote:
> > >> > > Nicolas,
> > >> > >
> > >> > > No sure I have used the new version you had uploaded. I test it
> > again,
> > >> it
> > >> > > stop at same step o...

[Zhanglei Mao (zhanglei-mao)]

Nicolas,

I didn't realise it is a CLI command can used directly :-). It will be a
bit easy now.

thanks,

On Fri, Jun 19, 2015 at 2:51 AM, Nicolas Thomas <
<email address hidden>> wrote:

> Mao
>
> : orange-box-purge-everything , is a CLI to do the cleanup.
>
> I disagree that reordering will change anything.. If maas is there and set
> up differently than what orange box expect we must stop and raise an issue
> ... I do not want to end up with unnoticed change of this nature...
>
> On a side note purging Maas is painfull due to Maas packaging and we should
> log bugs on those
> Le 18 juin 2015 07:00, "Zhanglei Mao" <email address hidden> a
> écrit :
>
> > Procedure is : orange-box-purge-everything , reboot , apt-get install
> > orange-box
> >
> > Yes, it works at last. But I have to say it is not easy.
> >
> > The rough steps are:
> > sudo apt-get purge maas-cluster-controller
> > sudo apt-get purge maas-region-controller python-django-maas
> > sudo apt-get purge maas-proxy
> > sudo apt-get purge maas orange-box
> > sudo apt-get autoremove
> > #reboot
> > sudo apt-get install
> >
> > during the process you may need to:
> > sudo rm /etc/apache2/conf-enabled//maas-cluster-http.conf
> > /etc/apache2/conf-enabled/maas-http.conf (if apache start failed)
> > sudo cat id_rsa.pub >> /home/ubuntu/.ssh/authorized_keys (if error caused
> > by not exist of this file)
> > sudo apachectl start (if apache restart failed)
> >
> > I didn't verify above and may test it again after back from trip and
> share
> > it next week.
> >
> > thanks,
> > Mao
> >
> >
> > On Wed, Jun 17, 2015 at 11:51 PM, Nicolas Thomas <
> > <email address hidden>> wrote:
> >
> > > That was not the intent to change behavior yet .. intent is to have a
> > > common baseline for enhancing as a team.
> > >
> > > Procedure is : orange-box-purge-everything , reboot , apt-get install
> > > orange-box
> > >
> > > If you don't like the sequence propose a branch :)
> > >
> > >
> > > On Wed, Jun 17, 2015 at 4:12 PM, Zhanglei Mao
> > > <email address hidden> wrote:
> > > > Nicolas,
> > > >
> > > > I though the right logic might as:
> > > > 1) preinst script of the orange-box -- adjust network according
> > > > 2) maas packages install --auto create mas-cluster-interfaces
> > > > 3) postinst script of the orange-box
> > > >
> > > > But it was actually happened as:
> > > > 1)maas pacakge install ( in case of deps by ornage-box)
> > > > 2)preinst script of the orange-box
> > > > 3)postinst script of the orange-box
> > > >
> > > > So this is cause that unnecessary interfaces was added by maas during
> > > > install. There seems no easy method to let network setup scripts runs
> > > > before the maas. So we may just delete all interface added by maas
> > > > automatically and create br0 interface inside the orange-box postinst
> > > > scripts.
> > > >
> > > > thanks,
> > > > Mao
> > > >
> > > >
> > > > On Mon, Jun 15, 2015 at 10:21 PM, Zhanglei Mao <
> > > <email address hidden>>
> > > > wrote:
> > > >
> > > >> Yes, no eth0 anymore. I gonna test it again Tomorrow.
> > > >> 2015年6月15日 下午10:09于 "Nicolas Thomas" <<email address hidden>
> > >写道：
> > > >>
> > > >> > You ...

[Nicolas Thomas (thomnico)]

Per Dan request this working package/approach is discarded

review: Needs Information

[lp:~thomnico/orange-box/newnet]

546. By Nicolas Thomas on 2015-07-17

Fix zone issue
Fix ssh-keyscan for maas asking user intervention

547. By Nicolas Thomas on 2015-07-17

fix default to em1 for internal_interface

548. By Nicolas Thomas on 2015-07-21

Couple of fixes
Add code to avoid issue when no .ssh for ubuntu user is present.

549. By Nicolas Thomas on 2015-07-21

Remove entries to avoid conflicts

Unmerged revisions

549. By Nicolas Thomas on 2015-07-21

Remove entries to avoid conflicts

548. By Nicolas Thomas on 2015-07-21

Couple of fixes
Add code to avoid issue when no .ssh for ubuntu user is present.

547. By Nicolas Thomas on 2015-07-17

fix default to em1 for internal_interface

546. By Nicolas Thomas on 2015-07-17

Fix zone issue
Fix ssh-keyscan for maas asking user intervention

545. By Nicolas Thomas on 2015-06-15

updates on ssh maas to ubuntu automation

modified:
  debian/changelog
  usr/bin/orange-box-add-virtual-nodes

544. By Nicolas Thomas on 2015-06-15

releasing 2.9~ppa2

543. By Nicolas Thomas on 2015-06-15

Update source/format so zbr-buildpackages works
make ssh works correctly in add-virutal-nodes

modified:
  debian/source/format
  usr/bin/orange-box-add-virtual-nodes

542. By Nicolas Thomas on 2015-06-15

releasing 2.9~ppa1

541. By Nicolas Thomas on 2015-06-15

releasing 2.8~ppa1

540. By Nicolas Thomas on 2015-06-15

* Add biosdevname cmd in scripts
* Add a check/heal for VMs powermanagement ssh keys
*

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-21 22:04:42 +0000
+++ debian/changelog	2015-07-21 17:58:26 +0000
@@ -1,20 +1,66 @@
-orange-box (1.90) unreleased; urgency=medium
-
-  * etc/apt/orange-box-mirror.list, usr/bin/orange-box-create-package-
-    mirror:
-    - we're not currently using postmirror.sh, so set to /bin/true
-
- -- Dustin Kirkland <[e-mail]>  Fri, 09 Jan 2015 11:13:51 -0600
-
-orange-box (1.89-0ubuntu1) vivid; urgency=medium
-
+orange-box (2.9ubuntu1~trusty) trusty; urgency=medium
+
+  * Change source/format for bzr-buildpackage to work
+  * Fix issue with the ssh checking for power management of VMs 
+  * 
+  * 
+
+ -- Nicolas Thomas <[e-mail]>  Mon, 15 Jun 2015 13:32:06 +0200
+
+orange-box (2.9-0ubuntu1) trusty; urgency=medium
+
+  * Add biosdevname cmd in scripts
+  * Add a check/heal for VMs powermanagement ssh keys
+  * 
+
+ -- Nicolas Thomas <[e-mail]>  Mon, 15 Jun 2015 10:40:23 +0200
+
+orange-box (2.8ubuntu1~trusty-0ubuntu1) trusty; urgency=medium
+
+  [ Nicolas Thomas ]
+  * Remove synccharmstore etc..
+  * Adapt a number of changes to network setup etc..
+  * Assume ob number in preinst and check in postinst in case network is not up
+  * preinst bridgeutils
+  
+ -- Nicolas Thomas <[e-mail]>  Thu, 11 Jun 2015 20:59:08 +0200
+
+orange-box (2.7) trusty; urgency=medium
+
+  [ Takenori Matsumoto ]
+  * usr/bin/orange-box-setup-nat:
+    - Fix net.ipv4.conf.all.accept_redirects
+  * usr/bin/orange-box-add-virtual-node
+    - Fix Add maas's ssh key into /home/ubuntu/.ssh/authorized_keys so that MAAS can control power via virsh
+
+ -- Takenori Matsumoto <[e-mail]>  Fri, 02 May 2015 14:13:51 -0600
+
+orange-box (2.6) trusty; urgency=medium
+
+  [ Takenori Matsumoto ]
+  * Re-write pachtes based on PPA (orange-box_1.89-0ubuntu1~trusty.debian.tar.xz, orange-box_1.89.orig.tar.gz) rather than trunk codes
+
+  [ takenori ]
+  * usr/bin/orange-box-add-virtual-nodes:
+  * usr/bin/orange-box-add-virtual-nodes:
+  * usr/bin/orange-box-add-virtual-nodes:
+  * :
+
+ -- Takenori Matsumoto <[e-mail]>  Fri, 02 May 2015 01:13:51 -0600
+
+orange-box (1.89-0ubuntu1~trusty) trusty; urgency=medium
+
+  [ Dustin Kirkland ]
   * usr/bin/orange-box-bootstrap-juju:
     - go back to --upload-tools, please keep this!
   * usr/bin/orange-box-add-virtual-nodes:
     - use ~maas rather than hard coding to /home/maas
       + note that maas 1.7 has created a home directory in /var/lib/maas
 
- -- Dustin Kirkland <[e-mail]>  Fri, 09 Jan 2015 11:13:49 -0600
+  [ takenori ]
+  * :
+
+ -- Dustin Kirkland <[e-mail]>  Wed, 29 Oct 2014 09:58:53 -0500
 
 orange-box (1.88-0ubuntu1) unstable; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-09-24 12:15:15 +0000
+++ debian/control	2015-07-21 17:58:26 +0000
@@ -9,7 +9,11 @@
 Package: orange-box
 Architecture: all
 Pre-Depends:
- run-one,
+ run-one, 
+ maas,
+ maas-cluster-controller,
+ nmap,
+ bridge-utils,
 Depends: ${misc:Depends},
  amtterm,
  apache2,
@@ -27,10 +31,7 @@
  libglib2.0-bin,
  libvirt-bin,
  openssh-server,
- maas,
- maas-cluster-controller,
  network-manager,
- nmap,
  pastebinit,
  qemu-kvm,
  remmina,
@@ -43,6 +44,7 @@
  vlan,
  wsmancli,
  x11vnc,
+ biosdevname,
 Recommends:
  landscape-client,
  python-keystone,

=== added file 'debian/install'
--- debian/install	1970-01-01 00:00:00 +0000
+++ debian/install	2015-07-21 17:58:26 +0000
@@ -0,0 +1,3 @@
+etc/
+home/
+usr/

=== modified file 'debian/links'
--- debian/links	2014-05-08 23:10:25 +0000
+++ debian/links	2015-07-21 17:58:26 +0000
@@ -1,1 +1,1 @@
-/usr/bin/orange-box-setup-nat /etc/network/if-up.d/orange-box-setup-nat
+

=== added file 'debian/postinst'
--- debian/postinst	1970-01-01 00:00:00 +0000
+++ debian/postinst	2015-07-21 17:58:26 +0000
@@ -0,0 +1,331 @@
+#!/bin/bash
+
+set -e
+set -x
+
+PKG="orange-box"
+RETRY=120
+
+. /usr/lib/orange-box/inc/common
+. /etc/orange-box.conf
+
+check_orangebox_number() {
+## be sure to wake AMT first give some time and ping again.
+nmap -p 16992 -oG - 172.27.${orangebox_number}.11-20 > /dev/null
+sleep 12
+nmap -p 16992 -oG - 172.27.${orangebox_number}.11-20 > /dev/null
+NUMAMTS=`nmap -p 16992 -oG - 172.27.${orangebox_number}.11-20 |grep open |wc -l`
+[[ $NUMAMTS < 3 ]] && (echo "AMT or hostname not set correctly"; rm -f /etc/orange-box.conf;exit 2)
+true
+}
+
+
+router_ip=172.27.${orangebox_number}.1
+static_low=172.27.`expr ${orangebox_number} + 2`.1
+static_high=172.27.`expr ${orangebox_number} + 2`.254
+dhcp_low=172.27.`expr ${orangebox_number} + 1`.1
+dhcp_high=172.27.`expr ${orangebox_number} + 1`.254
+br0_broadcast=172.27.`expr ${orangebox_number} + 3`.255
+
+setup_maas_admin() {
+	# Configure the MAAS admin user
+	# Sadly, there's no way to test if the user has been created already,
+	# so ignore errors for idempotence
+	maas-region-admin createadmin --username admin --email [e-mail] --password="admin" 2>/dev/null || true
+	. /etc/maas/maas_cluster.conf
+	APIKEY=$(maas-region-admin apikey --username admin | tail -n1)
+	maas login admin $MAAS_URL $APIKEY
+}
+
+setup_maas_networking() {
+	count=0
+	while ! maas admin node-group-interfaces list $CLUSTER_UUID >/dev/null 2>&1; do
+		count=$((count+1))
+		sleep 1
+		if [ $count -gt $RETRY ]; then
+			error "[maas admin node-group-interfaces list] failed [$RETRY] times"
+		fi
+	done
+	internal_interface=$(route -n | grep "^172\.27\.${orangebox_number}\." | sed -e "s/.* //")
+	# Support MAAS 1.5, and 1.6
+	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
+	if dpkg --compare-versions $maas_ver lt 1.6; then
+                maas admin node-group-interface update $CLUSTER_UUID $internal_interface ip_range_low=$static_low ip_range_high=$static_high management=2 broadcast_ip=$br0_broadcast router_ip=$router_ip
+
+	else
+		sh -x /var/lib/dpkg/info/maas-dns.postinst configure
+                run-one-until-success maas admin node-group-interface update $CLUSTER_UUID $internal_interface ip_range_low=$dhcp_low ip_range_high=$dhcp_high static_ip_range_low=$static_low static_ip_range_high=$static_high management=2 broadcast_ip=$br0_broadcast router_ip=$router_ip
+
+	fi
+	# Setup nat
+	# Ensure we have an external connection
+	orange-box-test-uplink
+	orange-box-setup-nat
+	# Redirect to MAAS web interface
+	cat >/var/www/html/index.html <<EOF
+<meta http-equiv="refresh" content="0; url=/MAAS">
+EOF
+}
+
+setup_dns() {
+	# Set MAAS upstream DNS
+	maas admin maas set-config name=upstream_dns value=172.27.252.1
+        sed -i -e "/^nameserver ${router_ip}$/d" /etc/resolvconf/resolv.conf.d/head
+        echo "nameserver ${router_ip}" >> /etc/resolvconf/resolv.conf.d/head
+	resolvconf -u
+	sed -e 's/dnssec-validation  auto;/dnssec-enable no;dnssec-validation no;/g' -i /etc/bind/named.conf.options
+}
+
+setup_squid() {
+	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
+	if dpkg --compare-versions $maas_ver lt 1.6; then
+		# This is now a transparent proxy
+		if [ -d "/etc/squid-deb-proxy" ]; then
+			echo > /etc/squid-deb-proxy/squid-deb-proxy.conf
+		fi
+		cat /usr/lib/orange-box/inc/squid.conf > /etc/squid3/squid.conf
+		# Enable squid3, disable squid-deb-proxy
+		update-rc.d -f squid-deb-proxy remove || true
+		invoke-rc.d squid-deb-proxy stop || true
+		# Create directories, if necessary
+		squid3 -z -N || true
+		ensure_running squid3
+	fi
+	true
+}
+
+setup_local_mirror() {
+	# Set up the local mirror
+	a2ensite archive
+	a2ensite ubuntu-cloud
+	a2dissite 000-default
+	mkdir -p /srv/mirrors/archive.ubuntu.com
+	echo '<meta http-equiv="refresh" content="0; url=MAAS/">' > /srv/mirrors/archive.ubuntu.com/index.html
+	invoke-rc.d apache2 stop || true
+	invoke-rc.d apache2 start
+}
+
+setup_boot_resources() {
+	# Importing boot resources
+	# This might take a long time.
+	# MAAS won't work very well until this is done, so we're going to block
+	# until this completes.
+	orange-box-test-uplink
+	# Support MAAS 1.5, and newer
+	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
+	if dpkg --compare-versions $maas_ver lt 1.6; then
+		cat /usr/lib/orange-box/inc/bootresources_1.5.yaml > /etc/maas/bootresources.yaml
+		run-this-one maas-import-pxe-files --config-file /etc/maas/bootresources.yaml
+	else
+		maas admin boot-resources import
+		while [ $(maas admin boot-images read $CLUSTER_UUID | wc -l) -lt 10 ]; do
+			# Waiting for images to download
+			sleep 10
+		done
+		# add precise to the list but don't wait it is not necessary now.
+		# usual failure is already there..
+		maas admin boot-source-selections create 1 os="ubuntu" release="precise" arches="amd64" subarches="*" labels="*" || true
+		maas admin boot-resources import
+	fi
+}
+
+setup_desktop() {
+	sudo -u ubuntu dbus-launch gsettings set org.gnome.desktop.background picture-uri file:///usr/share/orange-box/orange-box-background.png
+	sudo -u ubuntu dbus-launch gsettings set com.canonical.Unity.Launcher favorites "['firefox.desktop', 'byobu.desktop', 'remmina.desktop']"
+	sudo -u ubuntu dbus-launch gsettings set org.gnome.desktop.session idle-delay 999999
+	sudo -u ubuntu dbus-launch gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
+	sudo -u ubuntu dbus-launch gsettings set org.gnome.desktop.screensaver lock-enabled false
+	if [ -e /etc/lightdm/lightdm.conf ]; then
+		sed -i -e "/autologin-user=/d" /etc/lightdm/users.conf
+		echo "autologin-user=ubuntu" >> /etc/lightdm/users.conf
+	fi
+	echo "enabled=0" > /etc/default/apport
+	invoke-rc.d apport stop || true
+}
+
+setup_ssh_keys() {
+	# Disable remote password authentication, since our username/password
+	# combo is very well known
+	if ! grep -qs "^PasswordAuthentication no" /etc/ssh/sshd_config 2>/dev/null; then
+		echo "PasswordAuthentication no" >> /etc/ssh/sshd_config
+		invoke-rc.d ssh stop || true
+		invoke-rc.d ssh start
+	fi
+	if [ ! -e /home/ubuntu/.ssh/id_rsa ]; then
+		su -l ubuntu -c "ssh-keygen -N '' -f /home/ubuntu/.ssh/id_rsa"
+	fi
+	maas admin sshkeys new key="$(cat /home/ubuntu/.ssh/id_rsa.pub)" || true
+	if ! grep -qs "^Host.*maas$" /home/ubuntu/.ssh/config; then
+		cat <<EOF >>/home/ubuntu/.ssh/config
+
+Host *.maas
+UserKnownHostsFile /dev/null
+StrictHostKeyChecking no
+CheckHostIP no
+
+EOF
+	fi
+	chmod 600 /home/ubuntu/.ssh/config
+	chown -R ubuntu:ubuntu /home/ubuntu/.ssh/config
+
+}
+
+setup_juju() {
+	mkdir -p /home/ubuntu/.juju
+	cat >/home/ubuntu/.juju/environments.yaml <<EOF
+default: maas
+environments:
+    maas:
+        type: maas
+        maas-server: 'http://${router_ip}/MAAS/'
+        maas-oauth: '$APIKEY'
+        default-series: trusty
+        #enable-os-upgrade: false
+        authorized-keys-path: /home/ubuntu/.ssh/id_rsa.pub
+        admin-secret: 'admin'
+        logging-config: '<root>=DEBUG'
+        lxc-clone: true
+EOF
+	rm -rf /home/ubuntu/.juju-plugins
+	git clone https://github.com/juju/plugins /home/ubuntu/.juju-plugins
+	sudo chown -R ubuntu:ubuntu /home/ubuntu/
+	echo "PATH=\$PATH:/home/ubuntu/.juju-plugins:/home/ubuntu/Examples/bin" >> /home/ubuntu/.bashrc
+	#Required for local charm deployments to work.
+	sed -i -e '/^export JUJU_REPOSITORY=/d' /home/ubuntu/.bashrc
+}
+
+ensure_running() {
+	job="$1"
+	count=1
+	while true; do
+		if (service $job status | grep -qs "running"); then
+			break
+		fi
+		invoke-rc.d $job start
+		sleep 1
+		count=$((count+1))
+		if [ $count -gt $RETRY ]; then
+			error "[$job] refused to start [$RETRY] times"
+		fi
+	done
+}
+
+ensure_running_maas() {
+	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
+	if dpkg --compare-versions $maas_ver lt 1.6; then
+		ensure_running maas-region-celery
+		ensure_running maas-cluster-celery
+		ensure_running maas-txlongpoll
+		ensure_running maas-pserv
+		ensure_running maas-dhcp-server
+		ensure_running squid3
+	else
+		ensure_running apache2
+		ensure_running maas-clusterd
+		ensure_running maas-dhcpd
+		ensure_running maas-proxy
+	fi
+	invoke-rc.d tgt stop || true
+	invoke-rc.d tgt start
+	ensure_running tgt
+}
+
+setup_all_nodes() {
+	# Ensure that pxe and dhcp are running
+	ensure_running_maas
+	maas admin node-groups import-boot-images
+	orange-box-add-physical-nodes
+	orange-box-add-virtual-nodes
+}
+
+apply_patches() {
+	# This is a DISGUSTING HACK that needs to go away
+	# as soon as MAAS ships these fixes
+	cd /
+	cat /usr/lib/orange-box/patches/acquire_languages_none.patch | patch -p0 -N || true
+	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
+	if dpkg --compare-versions $maas_ver lt 1.6; then
+		cat /usr/lib/orange-box/patches/arp_ip_order.patch | patch -p0 -N || true
+		cat /usr/lib/orange-box/patches/try_amt_harder.patch | patch -p0 -N || true
+		rm -f /usr/lib/python2.7/dist-packages/provisioningserver/utils/__init__.pyc
+		invoke-rc.d maas-cluster-celery stop || true
+		invoke-rc.d maas-cluster-celery start
+	fi
+	cd -
+}
+
+setup_landscape() {
+	# The master node will be managed by Landscape
+	# TODO: this is currently hardcoded to our own landscape account
+	if which landscape-config; then
+		case "$(hostname)" in
+			OrangeBox*|orangebox*)
+				landscape-config -a canonical-orange -t "$(hostname)__$(dmidecode -s baseboard-serial-number)" -p ubuntu-aubergine --script-users=ALL --silent --include-manager-plugins=ScriptExecution || true
+			;;
+		esac
+	fi
+}
+
+setup_examples() {
+	mkdir -p /home/ubuntu
+	if [ -d /home/ubuntu/Examples/.bzr ]; then
+		bzr pull >/dev/null 2>&1 || true
+	elif [ -d /home/ubuntu/Examples ]; then
+		mv -f /home/ubuntu/Examples /home/ubuntu/.Examples
+		bzr branch lp:orange-box-examples /home/ubuntu/Examples >/dev/null 2>&1 || true
+	else
+		bzr branch lp:orange-box-examples /home/ubuntu/Examples >/dev/null 2>&1 || true
+	fi
+	chown -R ubuntu:ubuntu /home/ubuntu
+}
+
+case "$1" in
+	configure)
+		check_orangebox_number
+		setup_desktop
+		###apply_patches
+		setup_maas_admin
+		setup_dns
+		if [ -n "$2" ]; then
+			echo
+			echo "INFO: Skipping importing boot resources, since this is a package upgrade"
+			echo "INFO: If you want to update boot resources, run:"
+			echo "INFO:   sudo maas-import-pxe-files"
+			echo "INFO:   sudo maas admin node-groups import-boot-images"
+			echo
+		else
+			setup_boot_resources
+		fi
+		setup_maas_networking
+		maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
+		if dpkg --compare-versions $maas_ver lt 1.6; then
+			setup_squid
+		fi
+		setup_local_mirror
+		setup_ssh_keys
+		setup_juju
+		if [ -n "$2" ]; then
+			echo
+			echo "INFO: Skipping adding all nodes, since this is a package upgrade"
+			echo "INFO: If you want to delete and add all nodes again, run:"
+			echo "INFO:   sudo orange-box-add-physical-nodes"
+			echo "INFO:   sudo orange-box-add-virtual-nodes"
+			echo
+		else
+			# Only add all nodes and configure landscape on initial install, not upgrades
+			setup_landscape
+			setup_all_nodes
+		fi
+#		setup_examples
+	;;
+	abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== removed file 'debian/postinst'
--- debian/postinst	2014-11-27 23:56:37 +0000
+++ debian/postinst	1970-01-01 00:00:00 +0000
@@ -1,310 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-PKG="orange-box"
-RETRY=120
-
-. /usr/lib/orange-box/inc/common
-
-setup_maas_admin() {
-	# Configure the MAAS admin user
-	# Sadly, there's no way to test if the user has been created already,
-	# so ignore errors for idempotence
-	maas-region-admin createadmin --username admin --email [e-mail] --password="admin" 2>/dev/null || true
-	. /etc/maas/maas_cluster.conf
-	APIKEY=$(maas-region-admin apikey --username admin | tail -n1)
-	maas login admin $MAAS_URL $APIKEY
-}
-
-setup_maas_networking() {
-	count=0
-	while ! maas admin node-group-interfaces list $CLUSTER_UUID >/dev/null 2>&1; do
-		count=$((count+1))
-		sleep 1
-		if [ $count -gt $RETRY ]; then
-			error "[maas admin node-group-interfaces list] failed [$RETRY] times"
-		fi
-	done
-	internal_interface=$(route -n | grep "^10\.14\." | sed -e "s/.* //")
-	# Support MAAS 1.5, and 1.6
-	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
-	if dpkg --compare-versions $maas_ver lt 1.6; then
-		maas admin node-group-interface update $CLUSTER_UUID $internal_interface ip_range_low=10.14.100.1 ip_range_high=10.14.199.254 management=2 broadcast_ip=10.14.255.255 router_ip=10.14.4.1
-	else
-		sh -x /var/lib/dpkg/info/maas-dns.postinst configure
-		run-one-until-success maas admin node-group-interface update $CLUSTER_UUID $internal_interface ip_range_low=10.14.50.1 ip_range_high=10.14.99.254 static_ip_range_low=10.14.100.1 static_ip_range_high=10.14.199.254 management=2 broadcast_ip=10.14.255.255 router_ip=10.14.4.1
-	fi
-	# Setup nat
-	# Ensure we have an external connection
-	orange-box-test-uplink
-	orange-box-setup-nat
-	# Redirect to MAAS web interface
-	cat >/var/www/html/index.html <<EOF
-<meta http-equiv="refresh" content="0; url=/MAAS">
-EOF
-}
-
-setup_dns() {
-	# Set MAAS upstream DNS
-	external_interface=$(ip route ls | grep ^default | awk '{print $5}')
-	dns=$(nmcli d list iface $external_interface | grep -m 1 "^IP4.DNS" | awk '{ print $2 }')
-	maas admin maas set-config name=upstream_dns value=$dns
-	sed -i -e "/^nameserver 10.14.4.1$/d" /etc/resolvconf/resolv.conf.d/head
-	echo "nameserver 10.14.4.1" >> /etc/resolvconf/resolv.conf.d/head
-	resolvconf -u
-	sed -e 's/dnssec-validation  auto;/dnssec-enable no;dnssec-validation no;/g' -i /etc/bind/named.conf.options
-}
-
-setup_squid() {
-	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
-	if dpkg --compare-versions $maas_ver lt 1.6; then
-		# This is now a transparent proxy
-		if [ -d "/etc/squid-deb-proxy" ]; then
-			echo > /etc/squid-deb-proxy/squid-deb-proxy.conf
-		fi
-		cat /usr/lib/orange-box/inc/squid.conf > /etc/squid3/squid.conf
-		# Disable squid3, enable squid-deb-proxy
-		update-rc.d -f squid-deb-proxy remove || true
-		invoke-rc.d squid-deb-proxy stop || true
-		# Create directories, if necessary
-		squid3 -z -N || true
-		ensure_running squid3
-	fi
-	true
-}
-
-setup_local_mirror() {
-	# Set up the local mirror
-	a2ensite archive
-	a2ensite ubuntu-cloud
-	a2dissite 000-default
-	mkdir -p /srv/mirrors/archive.ubuntu.com
-	echo '<meta http-equiv="refresh" content="0; url=MAAS/">' > /srv/mirrors/archive.ubuntu.com/index.html
-	invoke-rc.d apache2 stop || true
-	invoke-rc.d apache2 start
-	# Sync the charm store to /srv/charmstore
-	# Note: This is going to take a LONG time
-	orange-box-sync-charmstore &
-}
-
-setup_boot_resources() {
-	# Importing boot resources
-	# This might take a long time.
-	# MAAS won't work very well until this is done, so we're going to block
-	# until this completes.
-	orange-box-test-uplink
-	# Support MAAS 1.5, and newer
-	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
-	if dpkg --compare-versions $maas_ver lt 1.6; then
-		cat /usr/lib/orange-box/inc/bootresources_1.5.yaml > /etc/maas/bootresources.yaml
-		run-this-one maas-import-pxe-files --config-file /etc/maas/bootresources.yaml
-	else
-		maas admin boot-resources import
-		while [ $(maas admin boot-images read $CLUSTER_UUID | wc -l) -lt 10 ]; do
-			# Waiting for images to download
-			sleep 10
-		done
-	fi
-}
-
-setup_desktop() {
-	sudo -u ubuntu dbus-launch gsettings set org.gnome.desktop.background picture-uri file:///usr/share/orange-box/orange-box-background.png
-	sudo -u ubuntu dbus-launch gsettings set com.canonical.Unity.Launcher favorites "['firefox.desktop', 'byobu.desktop', 'remmina.desktop']"
-	sudo -u ubuntu dbus-launch gsettings set org.gnome.desktop.session idle-delay 999999
-	sudo -u ubuntu dbus-launch gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
-	sudo -u ubuntu dbus-launch gsettings set org.gnome.desktop.screensaver lock-enabled false
-	if [ -e /etc/lightdm/lightdm.conf ]; then
-		sed -i -e "/autologin-user=/d" /etc/lightdm/users.conf
-		echo "autologin-user=ubuntu" >> /etc/lightdm/users.conf
-	fi
-	echo "enabled=0" > /etc/default/apport
-	invoke-rc.d apport stop || true
-}
-
-setup_ssh_keys() {
-	# Disable remote password authentication, since our username/password
-	# combo is very well known
-	if ! grep -qs "^PasswordAuthentication no" /etc/ssh/sshd_config 2>/dev/null; then
-		echo "PasswordAuthentication no" >> /etc/ssh/sshd_config
-		invoke-rc.d ssh stop || true
-		invoke-rc.d ssh start
-	fi
-	if [ ! -e /home/ubuntu/.ssh/id_rsa ]; then
-		su -l ubuntu -c "ssh-keygen -N '' -f /home/ubuntu/.ssh/id_rsa"
-	fi
-	maas admin sshkeys new key="$(cat /home/ubuntu/.ssh/id_rsa.pub)" || true
-	if ! grep -qs "^Host.*maas$" /home/ubuntu/.ssh/config; then
-		cat <<EOF >>/home/ubuntu/.ssh/config
-
-Host *.maas
-UserKnownHostsFile /dev/null
-StrictHostKeyChecking no
-CheckHostIP no
-
-EOF
-	fi
-	chmod 600 /home/ubuntu/.ssh/config
-	chown -R ubuntu:ubuntu /home/ubuntu/.ssh/config
-}
-
-setup_juju() {
-	mkdir -p /home/ubuntu/.juju
-	cat >/home/ubuntu/.juju/environments.yaml <<EOF
-default: maas
-environments:
-    maas:
-        type: maas
-        maas-server: 'http://10.14.4.1/MAAS/'
-        maas-oauth: '$APIKEY'
-        default-series: trusty
-        #enable-os-upgrade: false
-        authorized-keys-path: /home/ubuntu/.ssh/id_rsa.pub
-        admin-secret: 'admin'
-        logging-config: '<root>=DEBUG'
-        lxc-clone: true
-EOF
-	rm -rf /home/ubuntu/.juju-plugins
-	git clone https://github.com/juju/plugins /home/ubuntu/.juju-plugins
-	sudo chown -R ubuntu:ubuntu /home/ubuntu/
-	echo "PATH=\$PATH:/home/ubuntu/.juju-plugins:/home/ubuntu/Examples/bin" >> /home/ubuntu/.bashrc
-	#Required for local charm deployments to work.
-	sed -i -e '/^export JUJU_REPOSITORY=/d' /home/ubuntu/.bashrc
-	echo "export JUJU_REPOSITORY=/srv/charmstore" >> /home/ubuntu/.bashrc
-}
-
-ensure_running() {
-	job="$1"
-	count=1
-	while true; do
-		if (service $job status | grep -qs "running"); then
-			break
-		fi
-		invoke-rc.d $job start
-		sleep 1
-		count=$((count+1))
-		if [ $count -gt $RETRY ]; then
-			error "[$job] refused to start [$RETRY] times"
-		fi
-	done
-}
-
-ensure_running_maas() {
-	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
-	if dpkg --compare-versions $maas_ver lt 1.6; then
-		ensure_running maas-region-celery
-		ensure_running maas-cluster-celery
-		ensure_running maas-txlongpoll
-		ensure_running maas-pserv
-		ensure_running maas-dhcp-server
-		ensure_running squid3
-	else
-		ensure_running apache2
-		ensure_running maas-clusterd
-		ensure_running maas-dhcpd
-		ensure_running maas-proxy
-	fi
-	invoke-rc.d tgt stop || true
-	invoke-rc.d tgt start
-	ensure_running tgt
-}
-
-setup_all_nodes() {
-	# Ensure that pxe and dhcp are running
-	ensure_running_maas
-	maas admin node-groups import-boot-images
-	orange-box-add-physical-nodes
-	orange-box-add-virtual-nodes
-}
-
-apply_patches() {
-	# This is a DISGUSTING HACK that needs to go away
-	# as soon as MAAS ships these fixes
-	cd /
-	cat /usr/lib/orange-box/patches/acquire_languages_none.patch | patch -p0 -N || true
-	maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
-	if dpkg --compare-versions $maas_ver lt 1.6; then
-		cat /usr/lib/orange-box/patches/arp_ip_order.patch | patch -p0 -N || true
-		cat /usr/lib/orange-box/patches/try_amt_harder.patch | patch -p0 -N || true
-		rm -f /usr/lib/python2.7/dist-packages/provisioningserver/utils/__init__.pyc
-		invoke-rc.d maas-cluster-celery stop || true
-		invoke-rc.d maas-cluster-celery start
-	fi
-	cd -
-}
-
-setup_landscape() {
-	# The master node will be managed by Landscape
-	# TODO: this is currently hardcoded to our own landscape account
-	if which landscape-config; then
-		case "$(hostname)" in
-			OrangeBox*|orangebox*)
-				landscape-config -a canonical-orange -t "$(hostname)__$(dmidecode -s baseboard-serial-number)" -p ubuntu-aubergine --script-users=ALL --silent --include-manager-plugins=ScriptExecution || true
-			;;
-		esac
-	fi
-}
-
-setup_examples() {
-	mkdir -p /home/ubuntu
-	if [ -d /home/ubuntu/Examples/.bzr ]; then
-		bzr pull >/dev/null 2>&1 || true
-	elif [ -d /home/ubuntu/Examples ]; then
-		mv -f /home/ubuntu/Examples /home/ubuntu/.Examples
-		bzr branch lp:orange-box-examples /home/ubuntu/Examples >/dev/null 2>&1 || true
-	else
-		bzr branch lp:orange-box-examples /home/ubuntu/Examples >/dev/null 2>&1 || true
-	fi
-	chown -R ubuntu:ubuntu /home/ubuntu
-}
-
-case "$1" in
-	configure)
-		setup_desktop
-		apply_patches
-		setup_maas_admin
-		setup_dns
-		if [ -n "$2" ]; then
-			echo
-			echo "INFO: Skipping importing boot resources, since this is a package upgrade"
-			echo "INFO: If you want to update boot resources, run:"
-			echo "INFO:   sudo maas-import-pxe-files"
-			echo "INFO:   sudo maas admin node-groups import-boot-images"
-			echo
-		else
-			setup_boot_resources
-		fi
-		setup_maas_networking
-		maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
-		if dpkg --compare-versions $maas_ver lt 1.6; then
-			setup_squid
-		fi
-		setup_local_mirror
-		setup_ssh_keys
-		setup_juju
-		if [ -n "$2" ]; then
-			echo
-			echo "INFO: Skipping adding all nodes, since this is a package upgrade"
-			echo "INFO: If you want to delete and add all nodes again, run:"
-			echo "INFO:   sudo orange-box-add-physical-nodes"
-			echo "INFO:   sudo orange-box-add-virtual-nodes"
-			echo
-		else
-			# Only add all nodes and configure landscape on initial install, not upgrades
-			setup_landscape
-			setup_all_nodes
-		fi
-		setup_examples
-	;;
-	abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-	exit 1
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0

=== added file 'debian/postrm'
--- debian/postrm	1970-01-01 00:00:00 +0000
+++ debian/postrm	2015-07-21 17:58:26 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+webserver="apache2"
+
+case "$1" in
+	remove)
+		for i in archive ubuntu-cloud; do
+			if [ -e "/etc/apache2/sites-enabled/${i}.conf" ]; then
+				a2dissite $i
+			fi
+		done
+		invoke-rc.d $webserver reload
+		rm -f /var/log/orange-box-mirror.log
+		rm -rf /etc/maas
+		rm -rf /var/lib/orange-box
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== removed file 'debian/postrm'
--- debian/postrm	2014-07-17 04:12:46 +0000
+++ debian/postrm	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-webserver="apache2"
-
-case "$1" in
-	remove)
-		for i in archive ubuntu-cloud; do
-			if [ -e "/etc/apache2/sites-enabled/${i}.conf" ]; then
-				a2dissite $i
-			fi
-		done
-		invoke-rc.d $webserver reload
-		rm -f /var/log/orange-box-mirror.log
-		rm -rf /etc/maas
-		rm -rf /var/lib/orange-box
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0

=== added file 'debian/preinst'
--- debian/preinst	1970-01-01 00:00:00 +0000
+++ debian/preinst	2015-07-21 17:58:26 +0000
@@ -0,0 +1,166 @@
+#!/bin/sh
+set -e
+set -x
+
+get_orangebox_number() {
+## assume hostname as been set correctly .. will be checked in postinst
+OBNum=`hostname | cut -c 10- -`
+echo $OBNum
+echo "orangebox_number=$OBNum" > /etc/orange-box.conf
+}
+
+### According to OB networking re-design
+orangebox_number=`get_orangebox_number`
+default_maas_ip=172.27.${orangebox_number}.1
+gateway_ip=172.27.252.1
+external_ip=172.27.252.${orangebox_number}
+internal_ip=172.27.${orangebox_number}.1
+br0_broadcast=172.27.`expr ${orangebox_number} + 3`.255
+
+#unnecessary comment
+
+preflight_checks() {
+	if [ "$(id -u ubuntu)" != "1000" ]; then
+		echo "ERROR: Read the docs; a proper OrangeBox setup requires the default user to be [ubuntu]" 1>&2
+		exit 1
+	fi
+	#ensure em1 is the correct name
+	biosdevname -i eth1 || (echo "biosdevname should have been run already assume it does"; true)
+	# TODO: Check that the AMTs are on static IPs
+	# TODO: Check dual hard drives, which one is which
+	# TODO: Ensure we have two interfaces, one internal, one external
+}
+
+setup_debconf() {
+	echo "debconf maas/default-maas-url string $default_maas_ip" | debconf-set-selections -
+	echo "debconf maas-cluster-controller/maas-url string http://${default_maas_ip}/MAAS" | debconf-set-selections -
+	echo "debconf maas/installation-note boolean true" | debconf-set-selections -
+	echo "debconf iptables-persistent/autosave_done boolean true" | debconf-set-selections -
+	echo "debconf iptables-persistent/autosave_v4 boolean true" | debconf-set-selections -
+	echo "debconf iptables-persistent/autosave_v6 boolean true" | debconf-set-selections -
+}
+
+setup_networking() {
+	modprobe 8021q || true
+	sed -i -e "/8021q/d" /etc/modules || true
+	echo "8021q" >> /etc/modules
+	# Set up the two network interfaces
+	external_interface=$(ip route ls | grep ^default | awk '{print $5}')
+	# TODO: ip addr ls
+	for interface in $(ifconfig -a -s | grep -v ^Iface | awk '{print $1}'); do
+		case "$interface" in
+			lo|br*|wlan*|vnet*)
+				continue
+			;;
+			$external_interface)
+				continue
+			;;
+			*)
+				internal_interface="$interface"
+				break
+			;;
+		esac
+	done
+	# Set a sane default as em1 because the biosdevname should have been installed and run
+	[ -z "$internal_interface" ] && internal_interface=em1
+	# TODO: use ip
+	default_mac=$(ifconfig "$internal_interface" | grep "^$internal_interface" | sed -e "s/.*HWaddr //")
+	# Tell NetworkManager to piss off
+	sed -i -e "/^unmanaged-devices=mac:$default_mac$/d" /etc/NetworkManager/NetworkManager.conf
+	cat >>/etc/NetworkManager/NetworkManager.conf <<EOF
+[keyfile]
+unmanaged-devices=mac:$default_mac
+EOF
+	invoke-rc.d network-manager stop || true
+	invoke-rc.d network-manager start
+        cat >/etc/network/interfaces <<EOF
+auto lo
+iface lo inet loopback
+
+auto $external_interface
+iface $external_interface inet static
+        address ${external_ip}
+        netmask 255.255.252.0
+        broadcast 172.27.255.255
+        gateway ${gateway_ip}
+        dns-nameservers ${gateway_ip}
+
+auto $internal_interface
+iface $internal_interface inet manual
+
+
+auto br0
+iface br0 inet static
+        address ${internal_ip}
+        netmask 255.255.252.0
+        broadcast $br0_broadcast 
+        bridge_ports $internal_interface
+        bridge_stp off
+        bridge_fd 0
+        bridge_maxwait 0
+
+# VLAN 2, Uplink network
+iface ${internal_interface}.2 inet dhcp
+vlan-raw-device $internal_interface
+
+# Network management alias
+iface br0:1 inet static
+address 10.90.90.91
+netmask 255.255.255.0
+broadcast 10.90.90.255
+
+EOF
+	ifdown --force $internal_interface || true
+	ifdown --force br0 || true
+	ifup $internal_interface
+	ifup br0
+        ### Same for $external_interface
+        ifdown --force $external_interface || true
+        ifup $external_interface
+
+        # Wait a moment for the network to normalize
+	echo "INFO: Ensure networking has settled"
+	run-one-until-success ping -c 10 maas.ubuntu.com
+}
+
+setup_external_drive() {
+	# External drive must be:
+	#       a) partitioned into 1 big partition
+	#       b) ext4 formatted
+	# Find root disk
+	root_disk=$(mount | grep " on / " | awk '{print $1}' | sed -e "s/[0-9]\+$//")
+	# Find biggest non-root disk
+	ext_disk=$(fdisk -l | grep "^Disk /" | grep -v $root_disk | sort -k4 -n -r | awk '{print $2}' | awk -F: '{print $1}')
+	partition="${ext_disk}1"
+	if [ -b "$ext_disk" ]; then
+		if [ ! -b "$partition" ]; then
+			# Create the partition, if it doesn't exist already
+			echo "n
+p
+1
+
+
+w
+"|fdisk "$ext_disk"
+			mkfs.ext4 "$partition"
+		fi
+		sed -i -e "/ \/srv/d" /etc/fstab
+		# Add the fstab entry
+		uuid=$(blkid -s UUID -o value "$partition")
+		echo "UUID=$uuid /srv    ext4    defaults        1 1" >> /etc/fstab
+	fi
+	umount $partition || true
+	mount -a
+	chown root:root /srv
+	chmod 755 /srv
+}
+
+
+preflight_checks
+setup_external_drive
+setup_debconf
+setup_networking
+
+#DEBHELPER#
+
+exit 0

=== removed file 'debian/preinst'
--- debian/preinst	2014-08-25 14:32:16 +0000
+++ debian/preinst	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-#!/bin/sh
-set -e
-set -x
-
-#unnecessary comment
-
-preflight_checks() {
-	if [ "$(id -u ubuntu)" != "1000" ]; then
-		echo "ERROR: Read the docs; a proper OrangeBox setup requires the default user to be [ubuntu]" 1>&2
-		exit 1
-	fi
-	# TODO: Check that the AMTs are on static IPs
-	# TODO: Check dual hard drives, which one is which
-	# TODO: Ensure we have two interfaces, one internal, one external
-}
-
-setup_debconf() {
-	echo "debconf maas/default-maas-url string 10.14.4.1" | debconf-set-selections -
-	echo "debconf maas-cluster-controller/maas-url string http://10.14.4.1/MAAS" | debconf-set-selections -
-	echo "debconf maas/installation-note boolean true" | debconf-set-selections -
-	echo "debconf iptables-persistent/autosave_done boolean true" | debconf-set-selections -
-	echo "debconf iptables-persistent/autosave_v4 boolean true" | debconf-set-selections -
-	echo "debconf iptables-persistent/autosave_v6 boolean true" | debconf-set-selections -
-}
-
-setup_networking() {
-	modprobe 8021q || true
-	sed -i -e "/8021q/d" /etc/modules || true
-	echo "8021q" >> /etc/modules
-	# Set up the two network interfaces
-	external_interface=$(ip route ls | grep ^default | awk '{print $5}')
-	# TODO: ip addr ls
-	for interface in $(ifconfig -a -s | grep -v ^Iface | awk '{print $1}'); do
-		case "$interface" in
-			lo|br*|wlan*)
-				continue
-			;;
-			$external_interface)
-				continue
-			;;
-			*)
-				internal_interface="$interface"
-				break
-			;;
-		esac
-	done
-	# Set a sane default
-	[ -z "$internal_interface" ] && internal_interface=eth0
-	# TODO: use ip
-	default_mac=$(ifconfig "$internal_interface" | grep "^$internal_interface" | sed -e "s/.*HWaddr //")
-	# Tell NetworkManager to piss off
-	sed -i -e "/^unmanaged-devices=mac:$default_mac$/d" /etc/NetworkManager/NetworkManager.conf
-	cat >>/etc/NetworkManager/NetworkManager.conf <<EOF
-[keyfile]
-unmanaged-devices=mac:$default_mac
-EOF
-	invoke-rc.d network-manager stop || true
-	invoke-rc.d network-manager start
-        cat >/etc/network/interfaces <<EOF
-auto lo
-iface lo inet loopback
-
-auto $internal_interface
-iface $internal_interface inet manual
-
-auto br0
-iface br0 inet static
-        address 10.14.4.1
-        netmask 255.255.0.0
-        broadcast 10.14.255.255
-	bridge_ports $internal_interface
-	bridge_stp off
-	bridge_fd 0
-	bridge_maxwait 0
-
-# VLAN 2, Uplink network
-iface eth0.2 inet dhcp
-vlan-raw-device eth0
-
-# Network management alias
-iface br0:1 inet static
-address 10.90.90.91
-netmask 255.255.255.0
-broadcast 10.90.90.255
-
-EOF
-	ifdown --force $internal_interface || true
-	ifdown --force br0 || true
-	ifup $internal_interface
-	ifup br0
-        # Wait a moment for the network to normalize
-	echo "INFO: Ensure networking has settled"
-	run-one-until-success ping -c 10 maas.ubuntu.com
-}
-
-setup_external_drive() {
-	# External drive must be:
-	#       a) partitioned into 1 big partition
-	#       b) ext4 formatted
-	# Find root disk
-	root_disk=$(mount | grep " on / " | awk '{print $1}' | sed -e "s/[0-9]\+$//")
-	# Find biggest non-root disk
-	ext_disk=$(fdisk -l | grep "^Disk /" | grep -v $root_disk | sort -k4 -n -r | awk '{print $2}' | awk -F: '{print $1}')
-	partition="${ext_disk}1"
-	if [ -b "$ext_disk" ]; then
-		if [ ! -b "$partition" ]; then
-			# Create the partition, if it doesn't exist already
-			echo "n
-p
-1
-
-
-w
-"|fdisk "$ext_disk"
-			mkfs.ext4 "$partition"
-		fi
-		sed -i -e "/ \/srv/d" /etc/fstab
-		# Add the fstab entry
-		uuid=$(blkid -s UUID -o value "$partition")
-		echo "UUID=$uuid /srv    ext4    defaults        1 1" >> /etc/fstab
-	fi
-	umount $partition || true
-	mount -a
-	chown root:root /srv
-	chmod 755 /srv
-}
-
-
-preflight_checks
-setup_external_drive
-setup_debconf
-setup_networking
-
-#DEBHELPER#
-
-exit 0

=== modified file 'debian/source/format'
--- debian/source/format	2014-04-04 19:40:10 +0000
+++ debian/source/format	2015-07-21 17:58:26 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+3.0 (native)

=== modified file 'etc/apt/orange-box-mirror.list'
--- etc/apt/orange-box-mirror.list	2015-01-21 22:04:42 +0000
+++ etc/apt/orange-box-mirror.list	2015-07-21 17:58:26 +0000
@@ -8,7 +8,7 @@
 set var_path     $base_path/var
 set cleanscript  /bin/true
 set defaultarch  amd64
-set postmirror_script /bin/true
+# set postmirror_script $var_path/postmirror.sh
 # set run_postmirror 0
 set nthreads     20
 set _tilde 0

=== modified file 'usr/bin/orange-box-add-node'
--- usr/bin/orange-box-add-node	2014-10-27 20:54:45 +0000
+++ usr/bin/orange-box-add-node	2015-07-21 17:58:26 +0000
@@ -23,6 +23,9 @@
 set -e
 set -x
 
+## According to OB network re-design
+. /etc/orange-box.conf
+
 ip_to_mac() {
 	local ip="$1"
 	arp -n | sort | grep -m1 "^$ip\s" | awk '{print $3}'
@@ -31,7 +34,7 @@
 node_name() {
 	local num="${1##*.}"
 	num=$((num-10))
-	echo "node${num}"
+	echo "node${num}ob${orangebox_number}"
 }
 
 hostname_to_system_id() {
@@ -60,20 +63,20 @@
 maas admin zone read zone2 || maas admin zones create name=zone2 description="Physical machines on right side of Orange Box"
 
 #Create maas-br0 network if it does not already exist
-maas admin network read maas-br0 || maas admin networks create name=maas-br0 ip=10.14.0.0 netmask=255.255.0.0 default_gateway=10.14.4.1 dns_servers=10.14.4.1 description="Auto created when running orange-box-add-node"
+maas admin network read maas-br0 || maas admin networks create name=maas-br0 ip=172.27.${orangebox_number}.0 netmask=255.255.252.0 default_gateway=172.27.${orangebox_number}.1 dns_servers=172.27.${orangebox_number}.1 description="Auto created when running orange-box-add-node"
 
 # Loop over the list of ip addresses listening on 16992
 for ip in $@; do
 	mac=$(ip_to_mac $ip)
 	hostname=$(node_name $ip)
-	node=${hostname#node}
+	node=`echo ${hostname}| sed "s/node\(.*\)ob${orangebox_number}/\1/"`
 	if [ $node -lt 5 ]; then
 		zone="zone1"
 	else
 		zone="zone2"
 	fi
 	info "$ip --> $hostname --> $mac"
-	if [ -z "$ip" ] || [ "$ip" = "10.14.4.1" ]; then
+	if [ -z "$ip" ] || [ "$ip" = "172.27.${orangebox_number}.1" ]; then
 		continue
 	fi
 	# Remove it, if it's already here

=== modified file 'usr/bin/orange-box-add-physical-nodes'
--- usr/bin/orange-box-add-physical-nodes	2014-07-11 18:27:46 +0000
+++ usr/bin/orange-box-add-physical-nodes	2015-07-21 17:58:26 +0000
@@ -25,11 +25,16 @@
 
 oauth_login
 
+## According to OB network re-design
+. /etc/orange-box.conf
+
+
+
 # Search for nodes listening on AMT's 16992
 info "Searching for all nodes on the local network listening on 16992; this will take 60 seconds...."
-ips=$(time for i in $(seq 1 10); do nmap -p 16992 -oG - 10.14.4.1/24 | grep 16992/open | awk '{print $2}' ; done | sort -u -r)
+ips=$(time for i in $(seq 1 10); do nmap -p 16992 -oG - 172.27.${orangebox_number}.1/22 | grep 16992/open | awk '{print $2}' ; done | sort -u -r)
 if [ -z "$ips" ]; then
-	error "nmap did not find any nodes listening on [16992] on the [10.14.4.1/24] network"
+	error "nmap did not find any nodes listening on [16992] on the [172.27.${orangebox_number}.1/22] network"
 fi
 info "Found: [$ips]"
 

=== modified file 'usr/bin/orange-box-add-virtual-nodes'
--- usr/bin/orange-box-add-virtual-nodes	2015-02-07 16:07:08 +0000
+++ usr/bin/orange-box-add-virtual-nodes	2015-07-21 17:58:26 +0000
@@ -18,6 +18,13 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+## 
+## 
+. /etc/orange-box.conf
+
+external_ip="172.27.252.${orangebox_number}"
+internal_ip="172.27.${orangebox_number}.1"
+internal_network="172.27.${orangebox_number}.0"
 
 if [ "$(id -u)" != "0" ]; then
   echo "Must be run with sudo or by root"
@@ -29,13 +36,27 @@
 
 virsh net-info default && virsh net-destroy default && virsh net-undefine default
 
-[ -d ~maas ] || install -d /var/lib/maas --owner maas --group maas
+[ -d /var/lib/maas ] || install -d /var/lib/maas --owner maas --group maas
 chsh maas -s /bin/bash
-[ -d ~maas/.ssh ] || echo -e "\n\n\n" | sudo -u maas ssh-keygen -N "" -t rsa -f ~maas/.ssh/id_rsa
-grep 'maas@' /home/ubuntu/.ssh/authorized_keys || cat ~maas/.ssh/id_rsa.pub | tee -a /home/ubuntu/.ssh/authorized_keys
-printf "%s,%s %s %s\n" "node0.maas" "10.14.4.1" $(awk '{print $1 " " $2}' /etc/ssh/ssh_host_ecdsa_key.pub) | tee -a ~maas/.ssh/known_hosts
+[ -d /var/lib/maas/.ssh ] || mkdir /var/lib/maas/.ssh && chown maas:maas /var/lib/maas/.ssh
+[ -f /var/lib/maas/.ssh/id_rsa ] || echo -e "\n\n\n" | sudo -u maas ssh-keygen -N "" -t rsa -f /var/lib/maas/.ssh/id_rsa
+[ -f /var/lib/maas/.ssh/known_hosts ] || sudo -u maas ssh-keyscan 172.27.${orangebox_number}.1 |sudo -u maas  tee -a /var/lib/maas/.ssh/known_hosts > /dev/null 
+#Always add host keys .. not an issue if files grows
+sudo -u maas ssh-keyscan 172.27.${orangebox_number}.1 |sudo -u maas  tee -a /var/lib/maas/.ssh/known_hosts > /dev/null 
+# if very first install ubuntu user might not have authorized keys set.
+if [ ! -f /home/ubuntu/.ssh/authorized_keys ]; then
+    mkdir -p /home/ubuntu/.ssh/
+    cat /var/lib/maas/.ssh/id_rsa.pub | tee -a /home/ubuntu/.ssh/authorized_keys
+    chown -R ubuntu /home/ubuntu/.ssh/
+    chmod 700  /home/ubuntu/.ssh/
+fi
+sudo -u maas virsh -c qemu+ssh://ubuntu@172.27.${orangebox_number}.1/system list > /dev/null || sed -i '/ maas@/d' /home/ubuntu/.ssh/authorized_keys
+#If there is no key /new install or just removed add it"
+grep 'maas@' /home/ubuntu/.ssh/authorized_keys || cat /var/lib/maas/.ssh/id_rsa.pub | tee -a /home/ubuntu/.ssh/authorized_keys
+printf "%s,%s %s %s\n" "node0.maas" "$internal_ip" $(awk '{print $1 " " $2}' /etc/ssh/ssh_host_ecdsa_key.pub) | tee -a /var/lib/maas/.ssh/known_hosts
 chown -R ubuntu:ubuntu /home/ubuntu
 
+
 maas admin tags new name=virtual || true
 maas admin tags new name=bootstrap || true
 maas admin tags new name=neutron || true
@@ -53,25 +74,23 @@
 maas admin zone read zone0 || maas admin zones create name=zone0 description="Virtual machines on node0"
 
 #Create maas-br0 network if it does not already exist
-maas admin network read maas-br0 || maas admin networks create name=maas-br0 ip=10.14.0.0 netmask=255.255.0.0 default_gateway=10.14.4.1 dns_servers=10.14.4.1 description="Auto created when running orange-box-add-virtual-nodes"
+### For APAC Roadshow
+maas admin network read maas-br0 || maas admin networks create name=maas-br0 ip=${internal_network} netmask=255.255.252.0 default_gateway=${internal_ip} dns_servers=${internal_ip} description="Auto created when running orange-box-add-virtual-nodes"
+
 
 for i in $(seq 0 2 | sort -r); do
-	hostname="node0vm${i}.maas"
+	hostname="node0vm${i}ob${orangebox_number}.maas"
 	virsh destroy $hostname || true
 	virsh undefine $hostname || true
 	echo "INFO: Installing virtual machine"
-	virt-install --debug --name $hostname --ram 4096 --disk=path=/var/lib/orange-box/${hostname}-1.img,size=20 --disk=path=/var/lib/orange-box/${hostname}-2.img,size=2 --vcpus=2 --os-type=linux --pxe --network=bridge=br0,model=virtio --network=bridge=br0,model=rtl8139 --boot network --video=cirrus --graphics vnc|| true
+	virt-install --debug --name $hostname --ram 4096 --disk=path=/var/lib/orange-box/${hostname}-1.img,size=20 --disk=path=/var/lib/orange-box/${hostname}-2.img,size=2 --vcpus=2 --os-type=linux --pxe --network=bridge=br0 --network=bridge=br0 --boot network --video=cirrus --graphics vnc|| true
 	virsh console $hostname || true
-        #Workaround for bug: https://bugs.launchpad.net/maas/+bug/1367482
-        virsh dumpxml $hostname > /tmp/${hostname}.xml
-        sed -i -e "s#<model type='rtl8139'/>#<model type='rtl8139'/> <rom file=''/>#" /tmp/${hostname}.xml
-        virsh define /tmp/${hostname}.xml
 	virsh autostart $hostname
 	mac=$(virsh dumpxml $hostname | python -c 'import sys, lxml.etree; print list(lxml.etree.parse(sys.stdin).iter("mac"))[0].get("address")')
 	mac2=$(virsh dumpxml $hostname | python -c 'import sys, lxml.etree; print list(lxml.etree.parse(sys.stdin).iter("mac"))[0].get("address")')
 	system_id=$(maas admin nodes list mac_address=$mac | grep system_id | cut -d'"' -f4)
 	if [ -n "$system_id" ]; then
-		maas admin node update $system_id hostname=$hostname power_type=virsh power_parameters_power_address=qemu+ssh://ubuntu@10.14.4.1/system power_parameters_power_id=$hostname
+		maas admin node update $system_id hostname=$hostname power_type=virsh power_parameters_power_address=qemu+ssh://ubuntu@${internal_ip}/system power_parameters_power_id=$hostname
 		maas admin tag update-nodes "virtual" add=$system_id
 		case $i in
 			0)

=== modified file 'usr/bin/orange-box-amt-monitor'
--- usr/bin/orange-box-amt-monitor	2014-04-16 22:26:52 +0000
+++ usr/bin/orange-box-amt-monitor	2015-07-21 17:58:26 +0000
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-watch -n 10 "sudo nmap -p 16992 -oG - 10.14.4.1/24 | grep 16992/open | sort"
+. /etc/orange-box.conf
+watch -n 10 "sudo nmap -p 16992 -oG - 172.27.${orangebox_number}.0/22 | grep 16992/open | sort"
+

=== removed file 'usr/bin/orange-box-apm-power-fix'
--- usr/bin/orange-box-apm-power-fix	2014-10-31 09:19:40 +0000
+++ usr/bin/orange-box-apm-power-fix	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-#    orange-box-apm-power-fix - fix for issue with orange-box-apm-power
-#    Copyright (C) 2014 Canonical Ltd.
-#
-#    Authors: Darryl Weaver <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set -x
-
-if [ ! -f  /var/lib/maas/boot-resources/current/syslinux/poweroff-APM.com ]
-then
-cd /srv/data
-wget https://launchpadlibrarian.net/187530745/acpioff.c32
-cd /var/lib/maas/boot-resources/current/syslinux
-sudo mv poweroff.com poweroff-APM.com
-sudo mv /srv/data/acpioff.c32 poweroff.c32
-fi
-
-#fixing the AMT template 
-cd /srv/data
-wget https://launchpadlibrarian.net/187911231/not-permitted.patch
-cd /etc/maas/templates/power
-patch < /srv/data/not-permitted.patch
-
-exit
-

=== modified file 'usr/bin/orange-box-bootstrap-juju'
--- usr/bin/orange-box-bootstrap-juju	2015-01-07 23:15:31 +0000
+++ usr/bin/orange-box-bootstrap-juju	2015-07-21 17:58:26 +0000
@@ -24,8 +24,12 @@
         timeout 1m run-one-until-success nc -w 10 -zvv $@ 2>&1
 }
 
+## According to OB network re-disign
+. /etc/orange-box.conf
+
 juju status && echo "Existing deployment found, exiting." && exit 0
-juju bootstrap --to node0vm0.maas --show-log --upload-tools
+###juju bootstrap --to node0ob${orangebox_number}vm0.maas --show-log --upload-tools
+juju bootstrap --to node0vm0ob${orangebox_number}.maas --show-log --upload-tools
 juju set-constraints "tags="
 juju deploy --to 0 --repository=/srv/charmstore/ local:trusty/juju-gui
 juju expose juju-gui

=== modified file 'usr/bin/orange-box-create-package-mirror'
--- usr/bin/orange-box-create-package-mirror	2015-01-21 22:04:42 +0000
+++ usr/bin/orange-box-create-package-mirror	2015-07-21 17:58:26 +0000
@@ -27,7 +27,9 @@
 fi
 
 home=$PWD
-IP=10.14.4.1
+. /etc/orange-box.conf
+
+IP=172.27.${orangebox_number}.1
 
 function run_mirror { 
     echo "apt-mirror /etc/apt/orange-box-mirror.list >>/var/log/orange-box-mirror.log 2>&1"
@@ -95,6 +97,17 @@
 echo Making mirror directories ...
 mkdir -p /srv/mirrors /srv/skel /srv/var
 
+echo Creating postmirror.sh script ...
+# This created a blank file, for some reason :/
+echo << 'EOF' > /srv/var/postmirror.sh
+#!/bin/sh
+/srv/var/clean.sh
+EOF
+
+echo Making postmirror.sh executable ...
+chmod +x /srv/var/postmirror.sh
+echo Done. && echo
+
 echo Setting up the web dirs for mirroring ...
 ln -s /srv/mirrors/archive.ubuntu.com/ubuntu /var/www/html/archive.ubuntu.com
 ln -s /srv/mirrors/ubuntu-cloud.archive.canonical.com/ubuntu /var/www/html/ubuntu-cloud.archive.canonical.com

=== modified file 'usr/bin/orange-box-demo-cleanup'
--- usr/bin/orange-box-demo-cleanup	2014-10-23 22:18:49 +0000
+++ usr/bin/orange-box-demo-cleanup	2015-07-21 17:58:26 +0000
@@ -20,6 +20,8 @@
 
 ENVIRONMENT=`juju env`
 
+. /etc/orange-box.conf
+
 #Destroy juju environment
 juju destroy-environment $ENVIRONMENT
 #make sure AMTs are all powered off
@@ -27,6 +29,6 @@
 if dpkg --compare-versions $maas_ver lt 1.6; then
 	export AMT_PASSWORD=Password1+
 	for i in $(seq 11 19); do
-        	yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
+                yes | amttool 172.27.${orangebox_number}.$i powerdown >/dev/null 2>&1
 	done
 fi

=== added file 'usr/bin/orange-box-hacks'
--- usr/bin/orange-box-hacks	1970-01-01 00:00:00 +0000
+++ usr/bin/orange-box-hacks	2015-07-21 17:58:26 +0000
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+okay() {
+	echo "OK: $@"
+}
+
+error() {
+	echo "ERROR: $@"
+}
+
+# Check powerstate in AMT
+for i in $(seq 1 9); do
+	amtoutput=$(yes | amttool 10.14.4.1${i} info)
+	if [ "$amthostname" = "node${i}amt" ]; then
+		okay "[node${i}]: AMT is responsive"
+	else
+		error "[node${i}]: AMT is not responsive"
+	fi
+	amtpowerstate=$(echo "$amtoutput" | grep "^Powerstate:" | awk '{print $2}')
+	if [ -n "$amtpowerstate" ]; then
+		okay "[node${i}]: AMT powerstate [$amtpowerstate]"
+	else
+		error "[node${i}]: AMT powerstate unknown [$amtpowerstate]"
+	fi
+	uptime=$(ssh node$i.maas "uptime" 2>/dev/null)
+	if [ -n "$uptime" ]; then
+		okay "[node${i}]: SSH to node successful; uptime=[$uptime]"
+	else
+		error "[node${i}]: SSH to node unsuccessful; uptime=[$uptime]"
+	fi
+	echo
+done

=== modified file 'usr/bin/orange-box-purge-everything'
--- usr/bin/orange-box-purge-everything	2014-10-08 11:51:07 +0000
+++ usr/bin/orange-box-purge-everything	2015-07-21 17:58:26 +0000
@@ -21,6 +21,7 @@
 
 sudo apt-get purge $(dpkg -l | egrep "orange-box|maas|squid" | awk '{print $2}') bind9
 rm -rf /srv/boot-resources/* /etc/bind /root/.maascli.db
+rm -rf /home/ubuntu/.juju/environments/
 echo
 echo "=== IT IS HIGHLY RECOMMENDED THAT YOU REBOOT NOW! ==="
 echo

=== modified file 'usr/bin/orange-box-run'
--- usr/bin/orange-box-run	2014-06-11 01:00:16 +0000
+++ usr/bin/orange-box-run	2015-07-21 17:58:26 +0000
@@ -24,22 +24,25 @@
 	cmd="tail -f /var/log/cloud-init-output.log | ccze -A"
 fi
 
-tmux new-window -n all-nodes "ssh node1.maas $cmd" \; \
-	split-window -v "ssh node2.maas $cmd" \; \
-	select-layout tiled \; \
-	split-window -h "ssh node2.maas $cmd" \; \
-	select-layout tiled \; \
-	split-window -v "ssh node3.maas $cmd" \; \
-	select-layout tiled \; \
-	split-window -h "ssh node4.maas $cmd" \; \
-	select-layout tiled \; \
-	split-window -v "ssh node5.maas $cmd" \; \
-	select-layout tiled \; \
-	split-window -h "ssh node6.maas $cmd" \; \
-	select-layout tiled \; \
-	split-window -v "ssh node7.maas $cmd" \; \
-	select-layout tiled \; \
-	split-window -h "ssh node8.maas $cmd" \; \
-	select-layout tiled \; \
-	split-window -v "ssh node9.maas $cmd" \; \
+## According to OB network re-design
+. /etc/orange-box.conf
+
+tmux new-window -n all-nodes "ssh node1ob${orangebox_number}.maas $cmd" \; \
+	split-window -v "ssh node2ob${orangebox_number}.maas $cmd" \; \
+	select-layout tiled \; \
+	split-window -h "ssh node2ob${orangebox_number}.maas $cmd" \; \
+	select-layout tiled \; \
+	split-window -v "ssh node3ob${orangebox_number}.maas $cmd" \; \
+	select-layout tiled \; \
+	split-window -h "ssh node4ob${orangebox_number}.maas $cmd" \; \
+	select-layout tiled \; \
+	split-window -v "ssh node5ob${orangebox_number}.maas $cmd" \; \
+	select-layout tiled \; \
+	split-window -h "ssh node6ob${orangebox_number}.maas $cmd" \; \
+	select-layout tiled \; \
+	split-window -v "ssh node7ob${orangebox_number}.maas $cmd" \; \
+	select-layout tiled \; \
+	split-window -h "ssh node8ob${orangebox_number}.maas $cmd" \; \
+	select-layout tiled \; \
+	split-window -v "ssh node9ob${orangebox_number}.maas $cmd" \; \
 	select-layout tiled

=== added file 'usr/bin/orange-box-setup-nat'
--- usr/bin/orange-box-setup-nat	1970-01-01 00:00:00 +0000
+++ usr/bin/orange-box-setup-nat	2015-07-21 17:58:26 +0000
@@ -0,0 +1,127 @@
+#!/bin/bash
+#
+#    orange-box-setup-nat - Setup NAT for external network access by nodes
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors: Ronald McCollam <[e-mail]>
+#             Dustin Kirkland <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -x
+
+if [ "$(id -u)" != "0" ]; then
+	echo "Must be run with sudo or by root"
+	exit 77
+fi
+
+# Don't bother to restart sshd when lo is configured.
+if [ "$IFACE" = lo ]; then
+	exit 0
+fi
+
+# According to OB network re-design
+. /etc/orange-box.conf
+
+
+##internal=$(route -n | grep "^10\.14\." | sed -e "s/.* //")
+internal=$(route -n | grep "^172\.27\.${orangebox_number}\." | sed -e "s/.* //")
+external=$(ip route ls | grep ^default | awk '{print $5}')
+
+if [ -z "$internal" ] || [ -z "$external" ]; then
+	echo "usage: $0 [INTERNAL_INTERFACE] [EXTERNAL_INTERFACE]" 1>&2
+	exit 1
+fi
+
+set -e
+
+# Update MAAS upstream DNS
+maas admin maas set-config name=upstream_dns value=172.27.252.1 || true
+
+# Intel Centrino Advanced-N 6235 and Ubuntu don't work well with Wireless-N
+if lspci -v 2>/dev/null | grep -qs "Centrino Advanced-N 6235" 2>/dev/null; then
+	sed -i -e "/options iwlwifi 11n_disable=1/d" /etc/modprobe.d/iwlwifi.conf
+	echo "options iwlwifi 11n_disable=1" >> /etc/modprobe.d/iwlwifi.conf
+fi
+
+# Configure NAT and IP forwarding, giving slave NUCs external network access
+# through the master.
+
+# Enable IP forwarding and save for next boot
+echo 1 > /proc/sys/net/ipv4/ip_forward
+echo "net.ipv4.ip_forward=1" > /etc/sysctl.d/10-maas-ip-forward.conf
+echo "net.ipv4.conf.all.accept_redirects=1 >> /etc/sysctl.d/10-maas-ip-forward.conf"
+echo "net.ipv6.conf.all.accept_redirects=1 >> /etc/sysctl.d/10-maas-ip-forward.conf"
+echo "net.ipv4.conf.all.send_redirects=1 >> /etc/sysctl.d/10-maas-ip-forward.conf"
+sysctl --system
+
+#Create the static ip tables for multi OBs.
+cat > /etc/rc.local <<EOF
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+EOF
+for obn in `seq 4 4 80`
+do 
+    [[ $obn == ${orangebox_number} ]] ||echo " ip route add 172.27.$obn.0/22 via 172.27.252.$obn "  >> /etc/rc.local 
+done
+echo "exit 0" >>  /etc/rc.local 
+
+# Note that this script assumes no existing iptables rules. If you do have
+# any, they will be deleted.
+iptables --flush
+iptables --table nat --flush
+iptables --delete-chain
+iptables --table nat --delete-chain
+
+# Firewalling this machine
+# Allow incoming SSH
+iptables -A INPUT -i $external -p tcp --dport 22 -j ACCEPT
+iptables -A INPUT -i $external -m state --state ESTABLISHED,RELATED -j ACCEPT
+###iptables -A INPUT -i $external -j DROP
+
+# Some things use the MAAS proxy - some things don't. So turn on NAT.
+echo "Setting up ip forwarding"
+iptables -t nat -A POSTROUTING -o $external -j MASQUERADE
+iptables -A FORWARD -i $external -o $internal -m state --state RELATED,ESTABLISHED -j ACCEPT
+iptables -A FORWARD -i $internal -o $external -j ACCEPT
+# The following line sets up a transparent proxy
+iptables -A PREROUTING -t nat -i br0 -p tcp -m multiport --dports 80 -j REDIRECT --to-port 3128
+
+iptables-save > /etc/iptables/rules.v4
+
+# 14.10 deprecates the iptables-persistent service in favor of netfilter-persistent
+service iptables-persistent restart || service netfilter-persistent restart
+
+# It seems we need to restart squid3 after making these network changes
+maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
+if dpkg --compare-versions $maas_ver lt 1.6; then
+# We now run squid3, and NOT squid-deb-proxy
+	update-rc.d -f squid-deb-proxy remove || true
+	service squid-deb-proxy stop || true
+	service squid3 stop || true
+	service squid3 start
+else
+	service maas-proxy stop || true
+	service maas-proxy start || true
+fi

=== removed file 'usr/bin/orange-box-setup-nat'
--- usr/bin/orange-box-setup-nat	2014-10-08 11:51:07 +0000
+++ usr/bin/orange-box-setup-nat	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-#!/bin/bash
-#
-#    orange-box-setup-nat - Setup NAT for external network access by nodes
-#    Copyright (C) 2014 Canonical Ltd.
-#
-#    Authors: Ronald McCollam <[e-mail]>
-#             Dustin Kirkland <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set -x
-
-if [ "$(id -u)" != "0" ]; then
-	echo "Must be run with sudo or by root"
-	exit 77
-fi
-
-# Don't bother to restart sshd when lo is configured.
-if [ "$IFACE" = lo ]; then
-	exit 0
-fi
-
-internal=$(route -n | grep "^10\.14\." | sed -e "s/.* //")
-external=$(ip route ls | grep ^default | awk '{print $5}')
-
-
-if [ -z "$internal" ] || [ -z "$external" ]; then
-	echo "usage: $0 [INTERNAL_INTERFACE] [EXTERNAL_INTERFACE]" 1>&2
-	exit 1
-fi
-
-set -e
-
-# Update MAAS upstream DNS
-dns=$(nmcli d list iface $external | grep -m 1 "^IP4.DNS" | awk '{ print $2 }')
-maas admin maas set-config name=upstream_dns value=$dns || true
-
-# Intel Centrino Advanced-N 6235 and Ubuntu don't work well with Wireless-N
-if lspci -v 2>/dev/null | grep -qs "Centrino Advanced-N 6235" 2>/dev/null; then
-	sed -i -e "/options iwlwifi 11n_disable=1/d" /etc/modprobe.d/iwlwifi.conf
-	echo "options iwlwifi 11n_disable=1" >> /etc/modprobe.d/iwlwifi.conf
-fi
-
-# Configure NAT and IP forwarding, giving slave NUCs external network access
-# through the master.
-
-# Enable IP forwarding and save for next boot
-echo 1 > /proc/sys/net/ipv4/ip_forward
-echo "net.ipv4.ip_forward=1" > /etc/sysctl.d/10-maas-ip-forward.conf
-sysctl --system
-
-# Note that this script assumes no existing iptables rules. If you do have
-# any, they will be deleted.
-iptables --flush
-iptables --table nat --flush
-iptables --delete-chain
-iptables --table nat --delete-chain
-
-# Firewalling this machine
-# Allow incoming SSH
-iptables -A INPUT -i $external -p tcp --dport 22 -j ACCEPT
-iptables -A INPUT -i $external -m state --state ESTABLISHED,RELATED -j ACCEPT
-iptables -A INPUT -i $external -j DROP
-
-# Some things use the MAAS proxy - some things don't. So turn on NAT.
-echo "Setting up ip forwarding"
-iptables -t nat -A POSTROUTING -o $external -j MASQUERADE
-iptables -A FORWARD -i $external -o $internal -m state --state RELATED,ESTABLISHED -j ACCEPT
-iptables -A FORWARD -i $internal -o $external -j ACCEPT
-# The following line sets up a transparent proxy
-iptables -A PREROUTING -t nat -i br0 -p tcp -m multiport --dports 80 -j REDIRECT --to-port 3128
-
-iptables-save > /etc/iptables/rules.v4
-
-# 14.10 deprecates the iptables-persistent service in favor of netfilter-persistent
-service iptables-persistent restart || service netfilter-persistent restart
-
-# It seems we need to restart squid3 after making these network changes
-maas_ver=$(dpkg -l maas | tail -n1 | awk '{print $3}')
-if dpkg --compare-versions $maas_ver lt 1.6; then
-# We now run squid3, and NOT squid-deb-proxy
-	update-rc.d -f squid-deb-proxy remove || true
-	service squid-deb-proxy stop || true
-	service squid3 stop || true
-	service squid3 start
-else
-	service maas-proxy stop || true
-	service maas-proxy start || true
-fi

=== modified file 'usr/bin/orange-box-status-all-nodes'
--- usr/bin/orange-box-status-all-nodes	2014-10-20 11:58:14 +0000
+++ usr/bin/orange-box-status-all-nodes	2015-07-21 17:58:26 +0000
@@ -22,6 +22,9 @@
 export AMT_PASSWORD=Password1+
 ERRORS=0
 
+## According to OB network re-design 
+. /etc/orange-box.conf
+
 okay() {
         echo "OK:    $@"
 }
@@ -35,23 +38,23 @@
 status_all_nodes() {
         # Check all VM nodes
         for i in $(seq 0 2); do
-                if virsh list --all | grep node0vm${i} | grep running >/dev/null 2>&1; then
-                        okay "[node0vm${i}]: Is running"
-                        uptime=$(ssh node0vm${i}.maas "uptime" 2>/dev/null)
+                if virsh list --all | grep node0ob${orangebox_number}vm${i} | grep running >/dev/null 2>&1; then
+                        okay "[node0ob${orangebox_number}vm${i}]: Is running"
+                        uptime=$(ssh node0ob${orangebox_number}vm${i}.maas "uptime" 2>/dev/null)
                         if [ -n "$uptime" ]; then
-                                okay "[node0vm${i}]:  SSH to node successful; uptime=[$uptime]"
+                                okay "[node0ob${orangebox_number}vm${i}]:  SSH to node successful; uptime=[$uptime]"
                         else
-                                error "[node0vm${i}]:  SSH to node unsuccessful; uptime=[$uptime]"
+                                error "[node0ob${orangebox_number}vm${i}]:  SSH to node unsuccessful; uptime=[$uptime]"
                         fi
                 else
-                        error "[node0vm${i}]: Is not running"
+                        error "[node0ob${orangebox_number}vm${i}]: Is not running"
                 fi
         done
         # Check all AMT nodes
         for i in $(seq 1 9); do
-                hostname="node${i}.maas"
+                hostname="node${i}ob${orangebox_number}.maas"
                 # (1) Ping AMT IP Addresses
-                amt_ip="10.14.4.1$i"
+                amt_ip="172.27.${orangebox_number}.1$i"
                 if ping -c 1 -q $amt_ip >/dev/null 2>&1; then
                         okay "[$hostname]: AMT responding to ping [$amt_ip]"
                 else