diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-22 19:56:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-22 19:56:16 +0000 |
| commit | d85f6748ea307109b64beb7adbbbf6e694360f87 (patch) | |
| tree | 4f477229fdcd2f429de5ca0d5dd9c51b4197a558 | |
| parent | 056618ac9cfa750795649da4a94163a34868e4ec (diff) | |
| parent | 29b868572916a3dd5621a9bf73401a808e521efc (diff) | |
Merge "remove sticky ip address." into stable/brahmaputra
| -rw-r--r-- | ci/deployment.yaml | 4 | ||||
| -rw-r--r-- | ci/maas/default/deployment.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/deployment.yaml b/ci/deployment.yaml index 90b284b9..8ebfd5aa 100644 --- a/ci/deployment.yaml +++ b/ci/deployment.yaml @@ -11,8 +11,8 @@ demo-maas: arch: amd64 pool: default disk_size: 20G - sticky_ip_address: - requested_address: 192.168.122.25 +# sticky_ip_address: +# requested_address: 192.168.122.25 maas: # Defines the general setup for the MAAS environment, including the diff --git a/ci/maas/default/deployment.yaml b/ci/maas/default/deployment.yaml index 90b284b9..8ebfd5aa 100644 --- a/ci/maas/default/deployment.yaml +++ b/ci/maas/default/deployment.yaml @@ -11,8 +11,8 @@ demo-maas: arch: amd64 pool: default disk_size: 20G - sticky_ip_address: - requested_address: 192.168.122.25 +# sticky_ip_address: +# requested_address: 192.168.122.25 maas: # Defines the general setup for the MAAS environment, including the |