summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2
diff options
context:
space:
mode:
Diffstat (limited to 'ci/config_tpl/juju2')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml2
-rw-r--r--ci/config_tpl/juju2/maas_tpl/deployment.yaml2
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: |