diff options
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/subordinate.yaml | 6 | ||||
| -rw-r--r-- | labconfig/default/labconfig.yaml | 14 |
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 |