Change-Id: I5828c3b37e71da04515867f7e7d2b5bd10e9f9b1
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
juju destroy-controller $controllername --destroy-all-models -y || true
controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
juju destroy-controller $controllername --destroy-all-models -y || true
- juju kill-controller $controllername --timeout 10s -y || true
+# juju kill-controller $controllername --timeout 10s -y || true
rm -rf precise
rm -rf trusty
rm -rf xenial
rm -rf ~/joid_config/admin-openrc
rm -rf precise
rm -rf trusty
rm -rf xenial
rm -rf ~/joid_config/admin-openrc
sudo sysctl -w vm.drop_caches=3
elif [ -d $HOME/.juju/environments ]; then
echo " " > status.txt
sudo sysctl -w vm.drop_caches=3
elif [ -d $HOME/.juju/environments ]; then
echo " " > status.txt
{% endif %}
ceph-radosgw:
charm: "./{{ ubuntu.release }}/ceph-radosgw"
{% endif %}
ceph-radosgw:
charm: "./{{ ubuntu.release }}/ceph-radosgw"
- num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
+ num_units: {{ unit_qty() }}
{% if os.service.bindings %}
constraints: *ceph-access-constr
bindings:
{% if os.service.bindings %}
constraints: *ceph-access-constr
bindings:
{% endif %}
{% if opnfv.storage_dict.ceph is defined %}
ceph-osd-replication-count: {{ unit_ceph_qty() }}
{% endif %}
{% if opnfv.storage_dict.ceph is defined %}
ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
+{% if os.ha.mode == 'ha' %}
+ vip: {{ opnfv.vip.radosgw }}
-{% for unit_id in to_select(unit_qty() if os.beta.hacluster_ceph_radosgw else 1) %}
+{% for unit_id in to_select(unit_qty()) %}
- "lxd:nodes/{{ unit_id }}"
{% endfor %}
{% endif %}
- "lxd:nodes/{{ unit_id }}"
{% endfor %}
{% endif %}
prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
{% if os.network.controller != 'ocl' %}
prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
{% if os.network.controller != 'ocl' %}
-# hacluster-heat:
-# charm: "./{{ ubuntu.release }}/hacluster"
-# options:
-# corosync_transport: unicast
-# cluster_count: 3
+ hacluster-heat:
+ charm: "./{{ ubuntu.release }}/hacluster"
+ options:
+ corosync_transport: unicast
+ cluster_count: 3
-# prefer-ipv6: {{ os.network.ipv6 }}
+ prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
{% endif %}
hacluster-horizon:
{% endif %}
{% endif %}
hacluster-horizon:
{% if os.ha.mode == 'ha' %}
{% if os.network.controller != 'ocl' %}
{% if os.ha.mode == 'ha' %}
{% if os.network.controller != 'ocl' %}
-# - [ 'heat:ha', 'hacluster-heat:ha' ]
+ - [ 'heat:ha', 'hacluster-heat:ha' ]
- [ 'ceilometer:ha', 'hacluster-ceilometer:ha' ]
{% endif %}
- [ 'mysql:ha', 'hacluster-mysql:ha' ]
- [ 'ceilometer:ha', 'hacluster-ceilometer:ha' ]
{% endif %}
- [ 'mysql:ha', 'hacluster-mysql:ha' ]
- [ 'neutron-api:ha', 'hacluster-neutron:ha' ]
- [ 'nova-cloud-controller:ha', 'hacluster-nova:ha' ]
- [ 'openstack-dashboard:ha', 'hacluster-horizon:ha' ]
- [ 'neutron-api:ha', 'hacluster-neutron:ha' ]
- [ 'nova-cloud-controller:ha', 'hacluster-nova:ha' ]
- [ 'openstack-dashboard:ha', 'hacluster-horizon:ha' ]
-{% if os.beta.hacluster_ceph_radosgw %}
- [ 'ceph-radosgw:ha', 'hacluster-ceph-radosgw:ha' ]
{% endif %}
- [ 'ceph-radosgw:ha', 'hacluster-ceph-radosgw:ha' ]
{% endif %}
heat:
charm: "./{{ ubuntu.release }}/heat"
heat:
charm: "./{{ ubuntu.release }}/heat"
+ num_units: {{ unit_qty() }}
{% if os.service.bindings %}
bindings:
"": *oam-space
{% if os.service.bindings %}
bindings:
"": *oam-space
{% endif %}
worker-multiplier: *worker-multiplier
{% if os.ha.mode == 'ha' %}
{% endif %}
worker-multiplier: *worker-multiplier
{% if os.ha.mode == 'ha' %}
-# vip: {{ opnfv.vip.heat }}
+ vip: {{ opnfv.vip.heat }}
+{% for unit_id in to_select() %}
+ - "lxd:nodes/{{ unit_id }}"
+{% endfor %}
{# Empty block to avoid bad block trim #}
{# Empty block to avoid bad block trim #}
{% endif %}
options:
innodb-buffer-pool-size: 256M
{% endif %}
options:
innodb-buffer-pool-size: 256M
#use-https: "yes"
#https-service-endpoints: "True"
#performance-schema: true
#use-https: "yes"
#https-service-endpoints: "True"
#performance-schema: true
units: {{ lab.racks[0].nodes|count }}
vip:
{% if opnfv.spaces_dict.public is defined %}
units: {{ lab.racks[0].nodes|count }}
vip:
{% if opnfv.spaces_dict.public is defined %}
- ceilometer: {{ netpublic_prefix }}24 {{ net_prefix }}24
- cinder: {{ netpublic_prefix }}29 {{ net_prefix }}29
dashboard: {{ netpublic_prefix }}21 {{ net_prefix }}21
glance: {{ netpublic_prefix }}22 {{ net_prefix }}22
dashboard: {{ netpublic_prefix }}21 {{ net_prefix }}21
glance: {{ netpublic_prefix }}22 {{ net_prefix }}22
- heat: {{ netpublic_prefix }}28 {{ net_prefix }}28
keystone: {{ netpublic_prefix }}23 {{ net_prefix }}23
keystone: {{ netpublic_prefix }}23 {{ net_prefix }}23
+ ceilometer: {{ netpublic_prefix }}24 {{ net_prefix }}24
mysql: {{ net_prefix }}25
mysql: {{ net_prefix }}25
- neutron: {{ netpublic_prefix }}27 {{ net_prefix }}27
nova: {{ netpublic_prefix }}26 {{ net_prefix }}26
nova: {{ netpublic_prefix }}26 {{ net_prefix }}26
+ neutron: {{ netpublic_prefix }}27 {{ net_prefix }}27
+ heat: {{ netpublic_prefix }}28 {{ net_prefix }}28
+ cinder: {{ netpublic_prefix }}29 {{ net_prefix }}29
+ radosgw: {{ netpublic_prefix }}30 {{ net_prefix }}30
- ceilometer: {{ net_prefix }}24
- cinder: {{ net_prefix }}29
dashboard: {{ net_prefix }}21
glance: {{ net_prefix }}22
dashboard: {{ net_prefix }}21
glance: {{ net_prefix }}22
- heat: {{ net_prefix }}28
keystone: {{ net_prefix }}23
keystone: {{ net_prefix }}23
+ ceilometer: {{ net_prefix }}24
mysql: {{ net_prefix }}25
mysql: {{ net_prefix }}25
- neutron: {{ net_prefix }}27
+ neutron: {{ net_prefix }}27
+ heat: {{ net_prefix }}28
+ cinder: {{ net_prefix }}29
+ radosgw: {{ net_prefix }}30
ipv6: False
l2_population: False
beta:
ipv6: False
l2_population: False
beta:
- hacluster_ceph_radosgw: False
+ hacluster_ceph_radosgw: True
huge_pages: False
cpu_pin: False
cpu_pin_set: all
huge_pages: False
cpu_pin: False
cpu_pin_set: all