diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/bundle_tpl/mysql.yaml | 7 | ||||
| -rwxr-xr-x | ci/nosdn/fetch-charms.sh | 3 | ||||
| -rwxr-xr-x | ci/odl/fetch-charms.sh | 2 | ||||
| -rwxr-xr-x | ci/onos/fetch-charms.sh | 2 | ||||
| -rwxr-xr-x | ci/opencontrail/fetch-charms.sh | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/ci/bundle_tpl/mysql.yaml b/ci/bundle_tpl/mysql.yaml index 4835dfe6..6317608d 100644 --- a/ci/bundle_tpl/mysql.yaml +++ b/ci/bundle_tpl/mysql.yaml @@ -2,14 +2,15 @@ charm: "local:{{ ubuntu.release }}/percona-cluster" num_units: {{ unit_qty() }} options: - dataset-size: 2G - lp1366997-workaround: true - max-connections: 10000 + innodb-buffer-pool-size: 2G + #lp1366997-workaround: true + #max-connections: 20000 root-password: {{ get_password('mysql_root') }} sst-password: {{ get_password('mysql_sst') }} {% if os.ha.mode == 'ha' %} vip: {{ opnfv.vip.mysql }} {% endif %} + min-cluster-size: {{ unit_qty() }} to: {% for unit_id in to_select() %} - "lxc:nodes={{ unit_id }}" diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index d170e0e7..498ad8c4 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -23,8 +23,7 @@ git clone https://github.com/openstack/charm-cinder.git $distro/cinder git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone -#git clone -b bug/congress-fix https://github.com/gnuoy/charm-keystone.git $distro/keystone -git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.04 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index dc1c7fe3..2a42b6a8 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -23,7 +23,7 @@ git clone https://github.com/openstack/charm-cinder.git $distro/cinder git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone -git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.04 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index 97d109b1..ea48c90e 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -23,7 +23,7 @@ git clone https://github.com/openstack/charm-cinder.git $distro/cinder git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone -git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.04 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index d25881b7..8b6c5ba1 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -25,7 +25,7 @@ git clone https://github.com/openstack/charm-cinder.git $distro/cinder git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone -git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.04 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster #git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch |