diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-01-27 00:58:32 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-01-27 14:42:40 -0600 |
| commit | 50e1e675a3968f78fd45f5896c9de2269fb722ed (patch) | |
| tree | af1889f8cbc3e1e87f21c3888ef67fd1530ad2e0 /ci/config_tpl/juju2 | |
| parent | 50e1c44f64585abe63bd40982cb379412045fa33 (diff) | |
using propper labconfig.yaml so that it will match the other labs.
Also mofiied the deployment.yaml to generate the IP address of
admin bridge ip.
Enable novnc console access for instances.
Change-Id: I874831c3769b098182eccc83f841fc0a92ad5a37
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/maas_tpl/deployment.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml index dd421dc9..9eb02f9a 100644 --- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml @@ -19,7 +19,7 @@ options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" region: {{ os.region }} - #console-access-protocol: novnc + console-access-protocol: novnc neutron-external-network: ext-net service-guard: true {% if os.beta.public_api %} diff --git a/ci/config_tpl/juju2/maas_tpl/deployment.yaml b/ci/config_tpl/juju2/maas_tpl/deployment.yaml index b57ec01c..b8e84cc5 100644 --- a/ci/config_tpl/juju2/maas_tpl/deployment.yaml +++ b/ci/config_tpl/juju2/maas_tpl/deployment.yaml @@ -21,7 +21,7 @@ opnfv-{{ lab.location }}{{ lab.racks[0].rack }}-maas: {% for net in opnfv.spaces %} - bridge={{ net.bridge }},model=virtio {% endfor %} - ip_address: {{ opnfv.spaces_dict.admin.cidr[:-4] }}5 + ip_address: {{ os.brAdmIP }} memory: 4096 name: opnfv-{{ lab.location }}{{ lab.racks[0].rack }} network_config: | |