From 50e1e675a3968f78fd45f5896c9de2269fb722ed Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 27 Jan 2017 00:58:32 -0600 Subject: 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 --- ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml | 2 +- ci/config_tpl/juju2/maas_tpl/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ci') 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: | -- cgit 1.2.3-korg