summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-02-10 19:50:56 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-02-10 19:50:56 -0600
commita252191f5186f9ce77fadc3d158e1cbe4b183748 (patch)
tree6a315374ba8a87835c9525f7a5d78426502dd199
parent3add42efb7e43db0cc770563d3ecc32ccb493ccd (diff)
few more corrections of deployment and enabling interface within
MAAS. Change-Id: Ibd3175a5dce98c7be771ef44bbe6df579ce65d44 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/subordinate.yaml6
-rw-r--r--labconfig/default/labconfig.yaml14
2 files changed, 10 insertions, 10 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
index 015130b7..be7ced2c 100644
--- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
@@ -25,9 +25,9 @@
openvswitch-odl:
charm: ./{{ ubuntu.release }}/openvswitch-odl
options:
-+{% if opnfv.ext_port is defined %}
-+ provider_mappings: "physnet1:{{ opnfv.ext_port }}"
-+{% endif %}
+{% if opnfv.ext_port is defined %}
+ provider_mappings: "physnet1:{{ opnfv.ext_port }}"
+{% endif %}
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
diff --git a/labconfig/default/labconfig.yaml b/labconfig/default/labconfig.yaml
index d6983007..2dead607 100644
--- a/labconfig/default/labconfig.yaml
+++ b/labconfig/default/labconfig.yaml
@@ -7,28 +7,28 @@ lab:
architecture: x86_64
roles: [network,control]
nics:
- - ifname: eth0
+ - ifname: ens3
spaces: [admin]
- - ifname: eth1
+ - ifname: ens4
spaces: [floating]
- name: rack-vir-m2
architecture: x86_64
roles: [compute,control,storage]
nics:
- - ifname: eth0
+ - ifname: ens3
spaces: [admin]
- - ifname: eth1
+ - ifname: ens4
spaces: [floating]
- name: rack-vir-m3
architecture: x86_64
roles: [compute,control,storage]
nics:
- - ifname: eth1
+ - ifname: ens3
spaces: [admin]
- - ifname: eth1
+ - ifname: ens4
spaces: [floating]
floating-ip-range: 192.168.122.31,192.168.122.49,192.168.122.1,192.168.122.0/24
- ext-port: "eth1"
+ ext-port: "ens4"
dns: 8.8.8.8
opnfv:
release: d