Merge lp:~kubernetes/charms/trusty/flannel-docker/trunk into lp:charms/trusty/flannel-docker

[Charles Butler]

Includes a work-around python script to handle ansible raising an error when attempting to parse a non-existant array in the host_vars file.

Prior to this patch, the behavior of the charm was to enter error state if the network relation was not established before relating to etcd. This was problematic and made joining of relations very order-dependent.

This removes that requirement.

[lp:~kubernetes/charms/trusty/flannel-docker/trunk]

9. By Charles Butler on 2015-09-24

Update testplan w/ implicit make targets clean and lint

[Matt Bruzek (mbruzek)]

The tests are successfull: PASS: 5 Total: 5 (778.300656 sec)

I do have one comment, that was not involved in this change. Please change the tests to use the recommended etcd charm rather than the namespaced one.

review: Approve

[lp:~kubernetes/charms/trusty/flannel-docker/trunk]

10. By Charles Butler on 2015-09-24

repoint etcd to charm-store resource

[Matt Bruzek (mbruzek)]

+1 LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-04-01 18:50:44 +0000
+++ Makefile	2015-09-24 15:27:04 +0000
@@ -1,18 +1,23 @@
 #!/usr/bin/make
 
-build: virtualenv lint
-
-virtualenv: .venv/bin/python
-.venv/bin/python:
+
+build: tox lint test
+
+virtualenv:
 	virtualenv .venv
-	.venv/bin/pip install nose flake8 mock pyyaml charmhelpers ansible-lint ansible
-
-lint:.venv/bin/python
-	@echo Linting Charm
-	@charm proof
-	@echo Linting Ansible Routines
-	@.venv/bin/ansible-lint playbooks/*
+
+tox:
+/usr/bin/tox:
+	sudo apt-get install -y  python-tox python-dev python-virtualenv
+
+lint: /usr/bin/tox
+	tox -e lint
+
+
+unit_test: /usr/bin/tox
+	@# tox
+	@echo "Unit tests pending"
 
 clean:
-	rm -rf .venv
+	rm -rf .venv .tox
 	find -name *.pyc -delete
 
=== modified file 'README.md'
--- README.md	2015-04-01 19:53:51 +0000
+++ README.md	2015-09-24 15:27:04 +0000
@@ -1,5 +1,7 @@
 # Flannel (Docker Flavored)
 
+[![Build Status](http://drone.systemzoo.org/api/badge/github.com/chuckbutler/flannel-docker-charm/status.svg?branch=master)](http://drone.systemzoo.org/github.com/chuckbutler/flannel-docker-charm)
+
 ### About Flannel
 [Flannel](https://github.com/coreos/flannel) (originally rudder) is an overlay
 network that gives a subnet to each machine for use with containers.
 
=== modified file 'files/flannel.amd64.tar.gz'
 Binary files files/flannel.amd64.tar.gz	2015-01-16 23:34:13 +0000 and files/flannel.amd64.tar.gz	2015-09-24 15:27:04 +0000 differ
=== modified file 'hooks/setup.py'
--- hooks/setup.py	2015-01-16 23:34:13 +0000
+++ hooks/setup.py	2015-09-24 15:27:04 +0000
@@ -6,7 +6,7 @@
     Do any setup required before the install hook.
     """
     install_charmhelpers()
-    #subprocess.check_call(['pip', 'install', 'path.py'])
+    # subprocess.check_call(['pip', 'install', 'path.py'])
 
 
 def install_charmhelpers():
 
=== modified file 'playbooks/flannel-configuration.yaml'
--- playbooks/flannel-configuration.yaml	2015-01-16 23:34:13 +0000
+++ playbooks/flannel-configuration.yaml	2015-09-24 15:27:04 +0000
@@ -22,7 +22,7 @@
   when: etcd_joined == "True"
 
 - name: Install Upstart Template for flannel
-  template: src={{ charm_dir }}/templates/flannel.conf
+  template: src={{ charm_dir }}/templates/upstart.template
             dest=/etc/init/flannel.conf
             mode=0644
   when: etcd_joined == "True"
 
=== modified file 'playbooks/install-or-upgrade.yaml'
--- playbooks/install-or-upgrade.yaml	2015-01-16 23:34:13 +0000
+++ playbooks/install-or-upgrade.yaml	2015-09-24 15:27:04 +0000
@@ -9,4 +9,4 @@
     - name: Unpack the flannel binary
       unarchive: src={{ charm_dir }}/files/flannel.amd64.tar.gz
                  dest=/usr/local/bin
-                 creates=/usr/local/bin/flannel mode= 0755
+                 creates=/usr/local/bin/flannel mode='u=rx,g=rx,o=rx'
 
=== modified file 'playbooks/network-relation-changed.yaml'
--- playbooks/network-relation-changed.yaml	2015-05-21 15:00:11 +0000
+++ playbooks/network-relation-changed.yaml	2015-09-24 15:27:04 +0000
@@ -12,10 +12,14 @@
   shell: cat /run/flannel/subnet.env | grep FLANNEL_MTU | cut -f2 -d"="
   register: flannel_mtu
 
+- name: Read network relation
+  shell: "{{ charm_dir }}/scripts/parse_relation.py"
+  register: network_id
+
 - set_fact:
     flannel_mtu: "{{ flannel_mtu.stdout }}"
     flannel_subnet: "{{ flannel_subnet.stdout }}"
-    scoped_network: "{{ relations.network[0].__relid__ | default('') }}"
+    scoped_network: "{{ network_id.stdout | default('') }}"
 
 - name: Send Data to Docker Host for bridge configuration
   shell: relation-set -r {{ scoped_network }} flannel-subnet={{ flannel_subnet  }} flannel-mtu={{ flannel_mtu }} overlay_type=udp
 
=== added file 'pytest.ini'
--- pytest.ini	1970-01-01 00:00:00 +0000
+++ pytest.ini	2015-09-24 15:27:04 +0000
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --tb=short -s --cov=hooks --cov=modules --cov-report=term-missing
 
=== modified file 'scripts/etcd_rest.py'
--- scripts/etcd_rest.py	2015-01-16 23:34:13 +0000
+++ scripts/etcd_rest.py	2015-09-24 15:27:04 +0000
@@ -5,31 +5,37 @@
 import json
 import httplib
 import argparse
+import subprocess
 import sys
 
 
 def initialize_etcd(endpoint,
                     flannel_prefix="/coreos.com/network",
                     flannel_network="10.10.0.0/16"):
-
-    parsed = urlparse.urlparse(endpoint)
-    params = urllib.urlencode(
-        {"value": json.dumps({'Network': flannel_network})})
-    headers = {'content-type': 'application/x-www-form-urlencoded'}
-    path = "/v2/keys%s/config" % flannel_prefix
-    conn = httplib.HTTPConnection(parsed.hostname, parsed.port)
-    conn.request("PUT", path, params, headers)
-    response = conn.getresponse()
-    data = json.loads(response.read())
-    print("Initialize Etcd Network %s %s" % (response.status, response.reason))
-    print(data)
+    try:
+        parsed = urlparse.urlparse(endpoint)
+        params = urllib.urlencode(
+            {"value": json.dumps({'Network': flannel_network})})
+        headers = {'content-type': 'application/x-www-form-urlencoded'}
+        path = "/v2/keys%s/config" % flannel_prefix
+        conn = httplib.HTTPConnection(parsed.hostname, parsed.port)
+        conn.request("PUT", path, params, headers)
+        response = conn.getresponse()
+        data = json.loads(response.read())
+        print("Initialize Etcd Network %s %s" % (response.status,
+                                                 response.reason))
+        print(data)
+    except:
+        msg = "Unable to register with ETCD. Flannel not configured"
+        cmd = ['status-set', 'blocked', msg]
+        subprocess.call(cmd)
+        return 0
 
 
 def main(args=sys.argv[1:]):
     parser = argparse.ArgumentParser(description="stuff")
     parser.add_argument("endpoint")
-
-    args= parser.parse_args(args)
+    args = parser.parse_args(args)
     initialize_etcd(args.endpoint)
 
 
 
=== added file 'scripts/parse_relation.py'
--- scripts/parse_relation.py	1970-01-01 00:00:00 +0000
+++ scripts/parse_relation.py	2015-09-24 15:27:04 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+
+import yaml
+
+path='/etc/ansible/host_vars/localhost'
+
+with open(path, 'r') as f:
+    data = yaml.safe_load(f)
+
+try:
+  print data['relations']['network'][0]['__relid__']
+except:
+  pass
 
=== modified file 'templates/upstart.template'
--- templates/upstart.template	2015-01-16 23:34:13 +0000
+++ templates/upstart.template	2015-09-24 15:27:04 +0000
@@ -1,8 +1,8 @@
 description "Flannel Overlay Network"
-maintainer "Charles Butler <[e-mail]>"
+#maintainer "Charles Butler <[e-mail]>"
 
 start on runlevel [2345]
 stop on runlevel [!2345]
 
-exec /usr/local/bin/flannel -v=1 -ip-masq=true -etcd-endpoint=http://{{ etcd_ip}}:{{ etcd_ip }} -logtostderr=true
+exec /usr/local/bin/flannel -v=1 -ip-masq=true -etcd-endpoints=http://{{ etcd_ip}}:{{ etcd_port }} -logtostderr=true
 
 
=== modified file 'tests/10-deploy.py'
--- tests/10-deploy.py	2015-04-02 14:04:59 +0000
+++ tests/10-deploy.py	2015-09-24 15:27:04 +0000
@@ -21,7 +21,7 @@
 
         cls.deployment.add('docker', 'cs:trusty/docker')
         cls.deployment.add('flannel-docker')
-        cls.deployment.add('etcd', 'cs:~kubernetes/trusty/etcd')
+        cls.deployment.add('etcd', 'cs:trusty/etcd')
 
         cls.deployment.configure('docker', {})
         cls.deployment.configure('etcd', {})
 
=== modified file 'tests/tests.yaml'
--- tests/tests.yaml	2015-04-02 14:04:59 +0000
+++ tests/tests.yaml	2015-09-24 15:27:04 +0000
@@ -1,1 +1,4 @@
 virtualenv: False
+makefile:
+  - clean
+  - lint
 
=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2015-09-24 15:27:04 +0000
@@ -0,0 +1,35 @@
+[tox]
+envlist = py27
+skipsdist = True
+
+[testenv]
+install_command = pip install {opts} --pre --use-wheel {packages}
+deps =
+    pytest
+    pytest-cov
+    pytest-capturelog
+    mock
+    charmhelpers
+    pyyaml
+    ansible
+    path.py
+    funcsigs
+
+setenv =
+    PYTHONPATH = {toxinidir}/hooks
+
+commands =
+    py.test {posargs}
+
+[testenv:lint]
+install_command = pip install {opts} --pre --use-wheel {packages}
+deps =
+    flake8
+    charm-tools
+    ansible-lint
+
+commands =
+    flake8 {toxinidir}/hooks
+    charm proof
+    ansible-lint {toxinidir}/playbooks/site.yaml
+