Change-Id: Iea20b4071a6d8f67db4c190e509ef71f0a70358a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
openstack-origin-git: "{{ os.git_repo.branch }}"
{% endif %}
region: *openstack-region
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 }}
worker-multiplier: *worker-multiplier
{% if os.network.ipv6 %}
prefer-ipv6: {{ os.network.ipv6 }}
flat-network-providers: physnet1
{% if os.network.dvr %}
overlay-network-type: vxlan
flat-network-providers: physnet1
{% if os.network.dvr %}
overlay-network-type: vxlan
+ enable-dvr: True
+ l2-population: True
+ enable-l3ha: True
- overlay-network-type: vxlan gre
+ overlay-network-type: vxlan
default-tenant-network-type: vxlan
{% endif %}
{% elif os.network.controller == 'odl' %}
default-tenant-network-type: vxlan
{% endif %}
{% elif os.network.controller == 'odl' %}
flat-network-providers: physnet1
manage-neutron-plugin-legacy-mode: False
{% endif %}
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 %}
{% if os.network.l2_population %}
l2-population: true
{% endif %}
neutron-gateway:
charm: "./{{ ubuntu.release }}/neutron-gateway"
neutron-gateway:
charm: "./{{ ubuntu.release }}/neutron-gateway"
+{% if os.ha.mode == 'ha' %}
+ num_units: 2
+{% else %}
+ num_units: 1
+{% endif %}
{% if os.service.bindings %}
bindings:
"": *oam-space
{% if os.service.bindings %}
bindings:
"": *oam-space
bridge-mappings: physnet1:br-data
data-port: *data-port
{% endif %}
bridge-mappings: physnet1:br-data
data-port: *data-port
{% endif %}
+{% if os.ha.mode == 'ha' %}
+ - "nodes/1"
+{% endif %}
{# Empty block to avoid bad block trim #}
{# Empty block to avoid bad block trim #}
{% endif %}
{% if os.network.controller == 'nosdn' %}
bridge-mappings: physnet1:br-data
{% endif %}
{% if os.network.controller == 'nosdn' %}
bridge-mappings: physnet1:br-data
{% else %}
ext-port: {{ opnfv.ext_port }}
{% endif %}
{% else %}
ext-port: {{ opnfv.ext_port }}
{% endif %}
nova-compute:
charm: "./{{ ubuntu.release }}/nova-compute"
{% if os.hyperconverged %}
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 }}
{% else %}
{% if os.ha.mode == 'ha' %}
num_units: {{ opnfv.units - 3 }}
{% endif %}
to:
{% if os.hyperconverged %}
{% 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 %}
{% for unit_id in range(1, opnfv.units) %}
- "nodes/{{ unit_id }}"
{% endfor %}
{% else %}
{% if os.ha.mode == 'ha' %}
{% for unit_id in range(0, opnfv.units - 3) %}
{% else %}
{% if os.ha.mode == 'ha' %}
{% for unit_id in range(0, opnfv.units - 3) %}
network:
controller: odl
enhanced_ovs: False
network:
controller: odl
enhanced_ovs: False
ipv6: False
l2_population: False
beta:
ipv6: False
l2_population: False
beta:
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 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
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