Change-Id: I665848c577b988798462ba67502bc1ac2386e473
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
if [ ! -z "$4" ]; then
for i in `seq 1 7`;
do
if [ ! -z "$4" ]; then
for i in `seq 1 7`;
do
- nodes=`maas maas nodes list hostname=node$i-$4 | grep system_id | cut -d '"' -f 4`
+ nodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4`
if [ ! -z "$nodes" ]; then
maas maas interface link-subnet $nodes $1 mode=$2 subnet=$3
fi
if [ ! -z "$nodes" ]; then
maas maas interface link-subnet $nodes $1 mode=$2 subnet=$3
fi
case "$labname" in
'intelpod9' )
maas refresh
case "$labname" in
'intelpod9' )
maas refresh
- crvlanupdsubnet vlan902 1 "DataNetwork" 902 2 || true
- crvlanupdsubnet vlan905 2 "PublicNetwork" 905 3 || true
- crnodevlanint $vlan902 eth0 || true
+ crvlanupdsubnet vlan904 fabric-1 "MgmtNetwork" 904 2 || true
+ crvlanupdsubnet vlan905 fabric-2 "PublicNetwork" 905 3 || true
crnodevlanint $vlan905 eth1 || true
crnodevlanint $vlan905 eth1 || true
- enableautomodebyname eth0.902 AUTO "10.9.12.0/24" compute || true
- enableautomodebyname eth1.905 AUTO "10.9.15.0/24" compute || true
- enableautomodebyname eth0.902 AUTO "10.9.12.0/24" control || true
- enableautomodebyname eth1.905 AUTO "10.9.15.0/24" control || true
+ crnodevlanint $vlan905 eth3 || true
+ enableautomodebyname eth1.905 AUTO "10.9.15.0/24" || true
+ enableautomodebyname eth3.905 AUTO "10.9.15.0/24" || true
+ enableautomodebyname eth0 AUTO "10.9.12.0/24" || true
+ enableautomodebyname eth2 AUTO "10.9.12.0/24" || true
#ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
{% endif %}
to:
#ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
{% endif %}
to:
+{% if os.hyperconverged %}
{% for unit_id in to_select(unit_ceph_qty()) %}
- "lxc:nodes={{ unit_id }}"
{% endfor %}
{% for unit_id in to_select(unit_ceph_qty()) %}
- "lxc:nodes={{ unit_id }}"
{% endfor %}
+{% else %}
+{% if os.ha.mode == 'ha' %}
+{% for unit_id in range(0, 3) %}
+ - "lxc:nodes={{ unit_id }}"
+{% endfor %}
+{% else %}
+ - "lxc:nodes=0"
+ - "lxc:nodes=0"
+ - "lxc:nodes=0"
+{% endif %}
+{% endif %}
ceph-osd:
charm: "local:{{ ubuntu.release }}/ceph-osd"
{% if os.hyperconverged %}
ceph-osd:
charm: "local:{{ ubuntu.release }}/ceph-osd"
{% if os.hyperconverged %}
lxd: False
region: RegionOne
api:
lxd: False
region: RegionOne
api:
haproxy_timeout: 10000
admin:
role: admin
haproxy_timeout: 10000
admin:
role: admin
user: root
pass: root
floating-ip-range: 10.9.15.6,10.9.15.250,10.9.15.1,10.9.15.0/24
user: root
pass: root
floating-ip-range: 10.9.15.6,10.9.15.250,10.9.15.1,10.9.15.0/24
dns: 8.8.8.8
osdomainname:
opnfv:
dns: 8.8.8.8
osdomainname:
opnfv:
vlan:
- type: public
bridge: brPublic
vlan:
- type: public
bridge: brPublic
- cidr: 10.9.13.0/24
- gateway: 10.9.13.1
+ cidr: 10.9.15.0/24
+ gateway: 10.9.15.1
vlan:
- type: external
bridge: brExt
vlan:
- type: external
bridge: brExt