summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-09-30 19:14:03 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2015-09-30 19:14:03 -0500
commit0bee92804ca6769985daf0afbdc28993b93e6324 (patch)
treef21900e870f57f79ffeb92702aef45df24c45916 /ci
parentf3c28248e67eeec3a871844e7d528446421e5507 (diff)
fixing the router and juju issue.
Change-Id: I5f4d18a9259842dca69177fff7b6ac249ecf3bcd
Diffstat (limited to 'ci')
-rwxr-xr-xci/02-maasdeploy.sh8
-rwxr-xr-xci/maas/orange/pod2/deployment.yaml14
2 files changed, 11 insertions, 11 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index d8afb0c5..f507f3f4 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -27,8 +27,8 @@ if [ ! -e /var/lib/libvirt/images ]; then
sudo apt-get install libvirt-bin -y
sudo adduser ubuntu libvirtd
-
- virsh pool-define /dev/stdin <<EOF
+
+ sudo virsh pool-define /dev/stdin <<EOF
<pool type='dir'>
<name>default</name>
<target>
@@ -37,8 +37,8 @@ if [ ! -e /var/lib/libvirt/images ]; then
</pool>
EOF
- virsh pool-start default
- virsh pool-autostart default
+ sudo virsh pool-start default
+ sudo virsh pool-autostart default
fi
diff --git a/ci/maas/orange/pod2/deployment.yaml b/ci/maas/orange/pod2/deployment.yaml
index a52b9ff7..07406243 100755
--- a/ci/maas/orange/pod2/deployment.yaml
+++ b/ci/maas/orange/pod2/deployment.yaml
@@ -12,11 +12,11 @@ demo-maas:
# parameters for how the network is attached.
name: maas-boot-vm-dc1
interfaces: ['bridge=brAdm,model=virtio']
- memory: 4096
- vcpus: 2
+ memory: 3072
+ vcpus: 1
arch: amd64
pool: default
- disk_size: 160G
+ disk_size: 120G
# Apt http proxy setting(s)
apt_http_proxy:
@@ -97,7 +97,7 @@ demo-maas:
ip: 192.168.2.5
subnet_mask: 255.255.255.0
broadcast_ip: 192.168.2.255
- router_ip: 192.168.2.1
+ router_ip: 192.168.2.4
static_range:
low: 192.168.2.30
high: 192.168.2.150
@@ -194,8 +194,8 @@ demo-maas:
juju-bootstrap:
name: bootstrap
interfaces: ['bridge=brAdm,model=virtio']
- memory: 4096
- vcpus: 2
+ memory: 3072
+ vcpus: 1
arch: amd64
pool: default
- disk_size: 120G
+ disk_size: 60G