From 7dc5fe54938c5c51c04d5db5394170af4f3896e9 Mon Sep 17 00:00:00 2001
From: Billy Olsen <billy.olsen@gmail.com>
Date: Mon, 11 Sep 2017 13:09:27 -0700
Subject: [PATCH] Remove lp1366997-workaround config option

The percona-cluster packages have been fixed in the package
repositories and no longer need this option to work around the
duplicate primary key error that this worked around. This patch
removes this option.

Change-Id: I493c64c3167b51399484f6fec75f674bfe53e2fb
Related-Bug: #1366997
---
 config.yaml            | 7 -------
 hooks/percona_hooks.py | 1 -
 templates/my.cnf       | 8 --------
 3 files changed, 16 deletions(-)

diff --git a/config.yaml b/config.yaml
index 17b996d..15414f2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -177,13 +177,6 @@ options:
     description: |
       Default multicast port number that will be used to communicate between HA
       Cluster nodes.
-  lp1366997-workaround:
-    type: boolean
-    default: False
-    description: |
-      Adds two config options (wsrep_drupal_282555_workaround and
-      wsrep_retry_autocommit) as a workaround for Percona Primary Key bug (see
-      LP 1366997). Only required for Trusty.
   enable-binlogs:
     type: boolean
     default: False
diff --git a/hooks/percona_hooks.py b/hooks/percona_hooks.py
index be4b4db..480e47b 100755
--- a/hooks/percona_hooks.py
+++ b/hooks/percona_hooks.py
@@ -198,7 +198,6 @@ def render_config(hosts=None):
         'sst_password': sst_password(),
         'innodb_file_per_table': config('innodb-file-per-table'),
         'table_open_cache': config('table-open-cache'),
-        'lp1366997_workaround': config('lp1366997-workaround'),
         'binlogs_path': config('binlogs-path'),
         'enable_binlogs': config('enable-binlogs'),
         'binlogs_max_size': config('binlogs-max-size'),
diff --git a/templates/my.cnf b/templates/my.cnf
index 26a89b7..e8b7be8 100644
--- a/templates/my.cnf
+++ b/templates/my.cnf
@@ -106,14 +106,6 @@ innodb_buffer_pool_size = {{ innodb_buffer_pool_size }}
 sockopt=,pf=ip6
 {% endif %}
 
-{% if lp1366997_workaround -%}
-# Adding workaround for bug:
-#    https://bugs.launchpad.net/charms/+source/percona-cluster/+bug/1366997
-# Note that this should only be required for percona 5.5
-wsrep_drupal_282555_workaround = ON
-wsrep_retry_autocommit = 100
-{% endif %}
-
 !includedir /etc/mysql/conf.d/
 
 {% if series_upgrade %}