Merge lp:~evarlast/charms/trusty/elasticsearch/add-version-config into lp:~charmers/charms/trusty/elasticsearch/trunk

[Jay R. Wren]

Allow specifying the version of the elasticsearch package in charm config.

Use case: as an op, I must control what version of services I roll out to my production and other environments, so that I can test new versions while retaining the ability to roll out new old versions in both existing and new environments.

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-1269-results

review: Needs Fixing (automated testing)

[Michael Nelson (michael.nelson)]

Hi Jay,

Thanks for the update. Just fyi, the reason this hasn't been an issue in our usage is that as an op, we configure our own repository (ie. we control the private repo we're using to install from).

I understand that's not useful for everyone, so another option is to instead provide the deb in the charm (files/elasticsearch.deb) and this will be used instead (ie. under your total control).

That said, +1 to your change.

I need to update the tests so that test deps are installed (nosetests), and the amulet tests run on trusty, not precise (I'll find out about that).

Thanks!

review: Approve

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10370-results

review: Needs Fixing (automated testing)

[Michael Nelson (michael.nelson)]

You probably want to remerge trunk from

https://code.launchpad.net/~onlineservices-charmers/charms/trusty/elasticsearch/trunk

[Jay R. Wren (evarlast)]

Ah! Thanks for this.

I missed that the official charm is from ~onlineservices-charmers.

On Sun, Nov 23, 2014 at 2:55 PM, Michael Nelson <
<email address hidden>> wrote:

> You probably want to remerge trunk from
>
>
> https://code.launchpad.net/~onlineservices-charmers/charms/trusty/elasticsearch/trunk
> --
>
> https://code.launchpad.net/~evarlast/charms/trusty/elasticsearch/add-version-config/+merge/237916
> You are the owner of
> lp:~evarlast/charms/trusty/elasticsearch/add-version-config.
>

[Whit Morriss (whitmo)]

Taking a look at this branch. lp:~evarlast/charms/trusty/elasticsearch/add-version-config does not merge cleanly into head of https://code.launchpad.net/~onlineservices-charmers/charms/trusty/elasticsearch/trunk or vice versa.

I'm also curious what the relationship of the charmer/charms version and the online services version (which is more active) is / should be. The online services copy is clearly the canonical one, but whose responsibility is it to keep the charmers copy synced?

[Whit Morriss (whitmo)]

Marking a need fixing until the merge/upstream resolution gets figured out. Thanks y'all!

review: Needs Fixing

[Kevin W Monroe (kwmonroe)]

Just spoke to Jay. This change was needed last year to be able to handle a specific elasticsearch minor rev. It hasn't been needed since.

If this version-config feature becomes needed in the future, Jay will refactor his changes to apply to the latest ~onlineservices-charmers charm and open a new MP. Recommend rejecting/closing this MP.

As a side note, if this feature does become active again, please watch out for immutable config. If the version config is changed post-deployment, the charm will need to handle that. Adding config-changed to the yml may be all you need to do this:

...
+ tags:
+ - config-changed
+ - install
+ - upgrade-charm
...

review: Disapprove

Unmerged revisions

36. By Jay R. Wren on 2014-10-10

Add version config option

Disabled install-recommends.
Disabled extra unneeded runs of apt-get update.

=== modified file 'config.yaml'
--- config.yaml	2014-07-07 10:22:27 +0000
+++ config.yaml	2014-10-10 08:45:07 +0000
@@ -15,3 +15,16 @@
     default: "elasticsearch"
     description: |
       This sets the elasticsearch cluster name.
+  version:
+    type: string
+    default: ""
+    description: |
+        This sets the version of the package to be installed from the
+        repository. A default value of empty string will use the latest
+        version. This version must match a version in the repository specified
+        in teh apt-repository option. e.g. set this to 1.3.4 and set
+        apt-repository to "deb
+        http://packages.elasticsearch.org/elasticsearch/1.3/debian stable main"
+        to prevent future deploys of bundles using this charm from
+        automatically using 1.3.5 or newer when they are added to the
+        repository.

=== modified file 'tasks/install-elasticsearch.yml'
--- tasks/install-elasticsearch.yml	2014-07-07 15:37:42 +0000
+++ tasks/install-elasticsearch.yml	2014-10-10 08:45:07 +0000
@@ -17,7 +17,7 @@
   when: apt_repository != ""
 
 - name: Install dependent packages.
-  apt: pkg={{ item }} state=latest update_cache=yes
+  apt: pkg={{ item }} state=latest update_cache=yes install_recommends=no
   tags:
     - install
     - upgrade-charm
@@ -33,11 +33,18 @@
     - upgrade-charm
 
 - name: Install elasticsearch from repository
-  apt: pkg=elasticsearch state=latest update_cache=yes
-  tags:
-    - install
-    - upgrade-charm
-  when: stat_elasticsearch_deb.stat.exists == false and apt_repository != ""
+  apt: pkg=elasticsearch={{ version }} update_cache=no install_recommends=no
+  tags:
+    - install
+    - upgrade-charm
+  when: stat_elasticsearch_deb.stat.exists == false and apt_repository != "" and version != ""
+
+- name: Install elasticsearch from repository
+  apt: pkg=elasticsearch state=latest update_cache=no install_recommends=no
+  tags:
+    - install
+    - upgrade-charm
+  when: stat_elasticsearch_deb.stat.exists == false and apt_repository != "" and version == ""
 
 - name: Install ElasticSearch from payload
   command: dpkg -i {{ charm_dir }}/files/elasticsearch.deb

=== modified file 'tests/01-config-changes'
--- tests/01-config-changes	2014-02-10 13:16:56 +0000
+++ tests/01-config-changes	2014-10-10 08:45:07 +0000
@@ -7,7 +7,7 @@
 d = amulet.Deployment()
 
 d.add('elasticsearch')
-config = {'cluster-name': 'unique-name'}
+config = {'cluster-name': 'unique-name', 'version': '1.2.2'}
 d.configure('elasticsearch', config)
 
 helpers.setup_deployment(d)
@@ -20,3 +20,10 @@
     msg = ("Expected cluster name to be 'unique-name' "
            "but was '{}'.".format(cluster_name))
     amulet.raise_status(amulet.FAIL, msg=msg)
+
+version = helpers.get_root_status(d)['version']['number']
+print d.services['elasticsearch']['options']
+if version != config[version]:
+    msg = ("Expected version to be '{}' "
+           "but was '{}'.".format(cluster_name, config['version']))
+    amulet.raise_status(amulet.FAIL, msg=msg)

=== modified file 'tests/helpers/__init__.py'
--- tests/helpers/__init__.py	2014-02-10 13:16:56 +0000
+++ tests/helpers/__init__.py	2014-10-10 08:45:07 +0000
@@ -49,3 +49,10 @@
     response = requests.get(addr + "/_cluster/health/" + index_name)
     check_response(response, expected_code=200)
     return response.json()
+
+
+def get_root_status(deployment, unit_number=0):
+    addr = get_unit_address(deployment, unit_number=0)
+    response = requests.get(addr)
+    check_response(response, expected_code=200)
+    return response.json()