diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-22 10:59:32 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-22 19:53:15 +0000 |
| commit | 219b441cb247634096b355e9762454aab19037a2 (patch) | |
| tree | 69fec279e1d8d97e6bbc7eaf960ebe7460714c89 | |
| parent | a835c1b436ee942636986f942e2bd4b5330777e3 (diff) | |
modified to reflect the current user for virt install and ssh keys
Change-Id: If377a7cb2b6f03d491ca648b2da9c308c436421e
(cherry picked from commit 1294a4a4e1b53ce5942a91fe209813f490d20320)
| -rwxr-xr-x | ci/02-maasdeploy.sh | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | ci/deployment.yaml | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index a00fb002..0755ab5d 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -26,6 +26,10 @@ case "$1" in ;; esac +#just make sure the ssh keys added into maas for the current user +sed --i "s@/home/ubuntu@$HOME@g" ./deployment.yaml +sed --i "s@qemu+ssh://ubuntu@qemu+ssh://$USER@g" ./deployment.yaml + #make sure no password asked during the deployment. echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init diff --git a/ci/deployment.yaml b/ci/deployment.yaml index d0c9e6c4..90b284b9 100755..100644 --- a/ci/deployment.yaml +++ b/ci/deployment.yaml @@ -12,7 +12,7 @@ demo-maas: pool: default disk_size: 20G sticky_ip_address: - requested_address: 192.168.122.5 + requested_address: 192.168.122.25 maas: # Defines the general setup for the MAAS environment, including the @@ -36,7 +36,7 @@ demo-maas: # Package sources. These will be used on the MAAS controller. apt_sources: - - ppa:maas/stable + - ppa:maas/next - ppa:juju/stable # Virsh power settings @@ -110,11 +110,11 @@ demo-maas: broadcast_ip: 192.168.122.255 router_ip: 192.168.122.1 static_range: - low: 192.168.122.51 - high: 192.168.122.60 + low: 192.168.122.101 + high: 192.168.122.200 dynamic_range: - low: 192.168.122.5 - high: 192.168.122.50 + low: 192.168.122.25 + high: 192.168.122.100 # Physical nodes to be added to the MAAS cluster. Nodes will be # configured, commissioned and put into the Ready state so |