diff options
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 10 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml | 11 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml | 12 | ||||
| -rw-r--r-- | ci/default_deployment_config.yaml | 2 | ||||
| -rwxr-xr-x | juju/configure-juju-on-openstack | 2 |
6 files changed, 28 insertions, 11 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml index 823e251a..f6daca52 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml @@ -15,7 +15,7 @@ openstack-origin-git: "{{ os.git_repo.branch }}" {% endif %} region: *openstack-region - neutron-security-groups: true + neutron-security-groups: True worker-multiplier: *worker-multiplier {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} @@ -27,8 +27,11 @@ flat-network-providers: physnet1 {% if os.network.dvr %} overlay-network-type: vxlan + enable-dvr: True + l2-population: True + enable-l3ha: True {% else %} - overlay-network-type: vxlan gre + overlay-network-type: vxlan default-tenant-network-type: vxlan {% endif %} {% elif os.network.controller == 'odl' %} @@ -41,9 +44,6 @@ flat-network-providers: physnet1 manage-neutron-plugin-legacy-mode: False {% endif %} -{% if os.network.dvr %} - enable-dvr: true -{% endif %} {% if os.network.l2_population %} l2-population: true {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml index eedac793..041c6ae5 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml @@ -1,6 +1,10 @@ neutron-gateway: charm: "./{{ ubuntu.release }}/neutron-gateway" - num_units: 1 +{% if os.ha.mode == 'ha' %} + num_units: 2 +{% else %} + num_units: 1 +{% endif %} {% if os.service.bindings %} bindings: "": *oam-space @@ -27,7 +31,10 @@ bridge-mappings: physnet1:br-data data-port: *data-port {% endif %} - instance-mtu: 1400 + instance-mtu: 1300 to: - "nodes/0" +{% if os.ha.mode == 'ha' %} + - "nodes/1" +{% endif %} {# Empty block to avoid bad block trim #} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml index 6e7fa7ec..7714456a 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml @@ -22,7 +22,7 @@ {% endif %} {% if os.network.controller == 'nosdn' %} bridge-mappings: physnet1:br-data - #data-port: *data-port + data-port: *data-port {% else %} ext-port: {{ opnfv.ext_port }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml index 3c3a7200..6e084d15 100644 --- a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml @@ -1,7 +1,11 @@ nova-compute: charm: "./{{ ubuntu.release }}/nova-compute" {% if os.hyperconverged %} - num_units: {{ opnfv.units - 1 }} +{% if os.ha.mode == 'ha' %} + num_units: {{ opnfv.units - 2 }} +{% else %} + num_units: {{ opnfv.units - 1 }} +{% endif %} {% else %} {% if os.ha.mode == 'ha' %} num_units: {{ opnfv.units - 3 }} @@ -39,9 +43,15 @@ {% endif %} to: {% if os.hyperconverged %} +{% if os.ha.mode == 'ha' %} +{% for unit_id in range(2, opnfv.units) %} + - "nodes/{{ unit_id }}" +{% endfor %} +{% else %} {% for unit_id in range(1, opnfv.units) %} - "nodes/{{ unit_id }}" {% endfor %} +{% endif %} {% else %} {% if os.ha.mode == 'ha' %} {% for unit_id in range(0, opnfv.units - 3) %} diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml index 0a0f055b..587c39a1 100644 --- a/ci/default_deployment_config.yaml +++ b/ci/default_deployment_config.yaml @@ -23,7 +23,7 @@ os: network: controller: odl enhanced_ovs: False - dvr: False + dvr: True ipv6: False l2_population: False beta: diff --git a/juju/configure-juju-on-openstack b/juju/configure-juju-on-openstack index 6717ce53..e3fdaa96 100755 --- a/juju/configure-juju-on-openstack +++ b/juju/configure-juju-on-openstack @@ -105,7 +105,7 @@ swift stat simplestreams swift post simplestreams --read-acl .r:* openstack service show product-streams > /dev/null 2>&1 || openstack service create --name product-streams --description "Product Simple Stream" product-streams -SWIFT_URL=`openstack endpoint list --service swift --interface internal -c URL -f value` +SWIFT_URL=`openstack endpoint list --service swift --interface public -c URL -f value` openstack endpoint create --region $OS_REGION_NAME product-streams public $SWIFT_URL/simplestreams/images openstack endpoint create --region $OS_REGION_NAME product-streams internal $SWIFT_URL/simplestreams/images |