summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/clean.sh4
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/ceph.yaml7
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/haclusters.yaml12
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/harelations.yaml4
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/heat.yaml8
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/mysql.yaml2
-rw-r--r--ci/config_tpl/juju2/deployconfig.yaml18
-rw-r--r--ci/default_deployment_config.yaml2
8 files changed, 31 insertions, 26 deletions
diff --git a/ci/clean.sh b/ci/clean.sh
index feecd70a..5005b594 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -25,12 +25,12 @@ if [[ "$jujuver" > "2" ]]; then
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
- sleep 30
+ sleep 10
sudo sysctl -w vm.drop_caches=3
elif [ -d $HOME/.juju/environments ]; then
echo " " > status.txt
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 7fa9a8a0..0568b38a 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -79,7 +79,7 @@
{% 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:
@@ -99,8 +99,11 @@
{% if opnfv.storage_dict.ceph is defined %}
ceph-osd-replication-count: {{ unit_ceph_qty() }}
{% endif %}
+{% if os.ha.mode == 'ha' %}
+ vip: {{ opnfv.vip.radosgw }}
+{% endif %}
to:
-{% 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 %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
index 3b5f1844..091fa7e0 100644
--- a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
@@ -16,13 +16,13 @@
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
{% if os.network.ipv6 %}
-# prefer-ipv6: {{ os.network.ipv6 }}
+ prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
{% endif %}
hacluster-horizon:
diff --git a/ci/config_tpl/juju2/bundle_tpl/harelations.yaml b/ci/config_tpl/juju2/bundle_tpl/harelations.yaml
index 212516c5..8a4a2474 100644
--- a/ci/config_tpl/juju2/bundle_tpl/harelations.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/harelations.yaml
@@ -1,6 +1,6 @@
{% 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' ]
@@ -10,7 +10,5 @@
- [ '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 %}
-{% endif %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/heat.yaml b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
index 175283ce..6e26ac7f 100644
--- a/ci/config_tpl/juju2/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
@@ -1,6 +1,6 @@
heat:
charm: "./{{ ubuntu.release }}/heat"
- num_units: 1
+ num_units: {{ unit_qty() }}
{% if os.service.bindings %}
bindings:
"": *oam-space
@@ -17,8 +17,10 @@
{% endif %}
worker-multiplier: *worker-multiplier
{% if os.ha.mode == 'ha' %}
-# vip: {{ opnfv.vip.heat }}
+ vip: {{ opnfv.vip.heat }}
{% endif %}
to:
- - "lxd:nodes/0"
+{% for unit_id in to_select() %}
+ - "lxd:nodes/{{ unit_id }}"
+{% endfor %}
{# Empty block to avoid bad block trim #}
diff --git a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
index 87f6346a..f7ecc708 100644
--- a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
@@ -9,7 +9,7 @@
{% endif %}
options:
innodb-buffer-pool-size: 256M
- max-connections: 2000
+ max-connections: 4000
#use-https: "yes"
#https-service-endpoints: "True"
#performance-schema: true
diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml
index 9accba06..f94154cd 100644
--- a/ci/config_tpl/juju2/deployconfig.yaml
+++ b/ci/config_tpl/juju2/deployconfig.yaml
@@ -46,23 +46,25 @@ opnfv:
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
- heat: {{ netpublic_prefix }}28 {{ net_prefix }}28
keystone: {{ netpublic_prefix }}23 {{ net_prefix }}23
+ ceilometer: {{ netpublic_prefix }}24 {{ net_prefix }}24
mysql: {{ net_prefix }}25
- neutron: {{ netpublic_prefix }}27 {{ net_prefix }}27
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
{% else %}
- ceilometer: {{ net_prefix }}24
- cinder: {{ net_prefix }}29
dashboard: {{ net_prefix }}21
glance: {{ net_prefix }}22
- heat: {{ net_prefix }}28
keystone: {{ net_prefix }}23
+ ceilometer: {{ net_prefix }}24
mysql: {{ net_prefix }}25
- neutron: {{ net_prefix }}27
nova: {{ net_prefix }}26
+ neutron: {{ net_prefix }}27
+ heat: {{ net_prefix }}28
+ cinder: {{ net_prefix }}29
+ radosgw: {{ net_prefix }}30
{% endif %}
diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml
index 6d66ba71..0ea2a438 100644
--- a/ci/default_deployment_config.yaml
+++ b/ci/default_deployment_config.yaml
@@ -27,7 +27,7 @@ os:
ipv6: False
l2_population: False
beta:
- hacluster_ceph_radosgw: False
+ hacluster_ceph_radosgw: True
huge_pages: False
cpu_pin: False
cpu_pin_set: all