{"action":"created","comment":{"url":"https://api.github.com/repos/Metaswitch/calico/pulls/comments/28297901","id":28297901,"diff_hunk":"@@ -290,10 +290,16 @@ def _load_config_dict(self):\n         # profiles by id.  The response contains a generation ID allowing us\n         # to then start polling for updates without missing any.\n         global_cfg = self.client.read(\"/calico/config/\")\n-        host_cfg = self.client.read(\"/calico/host/%s/config/\" %\n-                                    self.config.HOSTNAME)\n+        configs = [global_cfg]\n+        try:\n+            host_cfg = self.client.read(\"/calico/host/%s/config/\" %\n+                                        self.config.HOSTNAME)\n+        except KeyError:\n+            _log.info(\"No configuration overrides for this node\")\n+        else:\n+            configs.append(host_cfg)\n \n-        for child in itertools.chain(global_cfg.children, host_cfg.children):\n+        for child in itertools.chain(*[cfg.children for cfg in configs]):","path":"calico/felix/fetcd.py","position":16,"original_position":16,"commit_id":"f8b6a61d5292fc76e8a110448273bd735dba95d0","original_commit_id":"f8b6a61d5292fc76e8a110448273bd735dba95d0","user":{"login":"fasaxc","id":469264,"avatar_url":"https://avatars.githubusercontent.com/u/469264?v=3","gravatar_id":"","url":"https://api.github.com/users/fasaxc","html_url":"https://github.com/fasaxc","followers_url":"https://api.github.com/users/fasaxc/followers","following_url":"https://api.github.com/users/fasaxc/following{/other_user}","gists_url":"https://api.github.com/users/fasaxc/gists{/gist_id}","starred_url":"https://api.github.com/users/fasaxc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fasaxc/subscriptions","organizations_url":"https://api.github.com/users/fasaxc/orgs","repos_url":"https://api.github.com/users/fasaxc/repos","events_url":"https://api.github.com/users/fasaxc/events{/privacy}","received_events_url":"https://api.github.com/users/fasaxc/received_events","type":"User","site_admin":false},"body":"Agree, can probably do this a bit cleaner.  That said, host_cfg isn't a list, it's an etcd node representing the directory.  cfg.children returns an iterator.","created_at":"2015-04-14T03:06:19Z","updated_at":"2015-04-14T03:06:19Z","html_url":"https://github.com/Metaswitch/calico/pull/352#discussion_r28297901","pull_request_url":"https://api.github.com/repos/Metaswitch/calico/pulls/352","_links":{"self":{"href":"https://api.github.com/repos/Metaswitch/calico/pulls/comments/28297901"},"html":{"href":"https://github.com/Metaswitch/calico/pull/352#discussion_r28297901"},"pull_request":{"href":"https://api.github.com/repos/Metaswitch/calico/pulls/352"}}},"pull_request":{"url":"https://api.github.com/repos/Metaswitch/calico/pulls/352","id":33216557,"html_url":"https://github.com/Metaswitch/calico/pull/352","diff_url":"https://github.com/Metaswitch/calico/pull/352.diff","patch_url":"https://github.com/Metaswitch/calico/pull/352.patch","issue_url":"https://api.github.com/repos/Metaswitch/calico/issues/352","number":352,"state":"open","locked":false,"title":"Be resilient to missing per-host config.","user":{"login":"fasaxc","id":469264,"avatar_url":"https://avatars.githubusercontent.com/u/469264?v=3","gravatar_id":"","url":"https://api.github.com/users/fasaxc","html_url":"https://github.com/fasaxc","followers_url":"https://api.github.com/users/fasaxc/followers","following_url":"https://api.github.com/users/fasaxc/following{/other_user}","gists_url":"https://api.github.com/users/fasaxc/gists{/gist_id}","starred_url":"https://api.github.com/users/fasaxc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fasaxc/subscriptions","organizations_url":"https://api.github.com/users/fasaxc/orgs","repos_url":"https://api.github.com/users/fasaxc/repos","events_url":"https://api.github.com/users/fasaxc/events{/privacy}","received_events_url":"https://api.github.com/users/fasaxc/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-04-14T00:24:21Z","updated_at":"2015-04-14T03:06:19Z","closed_at":null,"merged_at":null,"merge_commit_sha":"4c5adb339e680afaf4b67963deccf7adb84cd306","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Metaswitch/calico/pulls/352/commits","review_comments_url":"https://api.github.com/repos/Metaswitch/calico/pulls/352/comments","review_comment_url":"https://api.github.com/repos/Metaswitch/calico/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Metaswitch/calico/issues/352/comments","statuses_url":"https://api.github.com/repos/Metaswitch/calico/statuses/f8b6a61d5292fc76e8a110448273bd735dba95d0","head":{"label":"Metaswitch:smc-fix-missing-config","ref":"smc-fix-missing-config","sha":"f8b6a61d5292fc76e8a110448273bd735dba95d0","user":{"login":"Metaswitch","id":453759,"avatar_url":"https://avatars.githubusercontent.com/u/453759?v=3","gravatar_id":"","url":"https://api.github.com/users/Metaswitch","html_url":"https://github.com/Metaswitch","followers_url":"https://api.github.com/users/Metaswitch/followers","following_url":"https://api.github.com/users/Metaswitch/following{/other_user}","gists_url":"https://api.github.com/users/Metaswitch/gists{/gist_id}","starred_url":"https://api.github.com/users/Metaswitch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Metaswitch/subscriptions","organizations_url":"https://api.github.com/users/Metaswitch/orgs","repos_url":"https://api.github.com/users/Metaswitch/repos","events_url":"https://api.github.com/users/Metaswitch/events{/privacy}","received_events_url":"https://api.github.com/users/Metaswitch/received_events","type":"Organization","site_admin":false},"repo":{"id":21242831,"name":"calico","full_name":"Metaswitch/calico","owner":{"login":"Metaswitch","id":453759,"avatar_url":"https://avatars.githubusercontent.com/u/453759?v=3","gravatar_id":"","url":"https://api.github.com/users/Metaswitch","html_url":"https://github.com/Metaswitch","followers_url":"https://api.github.com/users/Metaswitch/followers","following_url":"https://api.github.com/users/Metaswitch/following{/other_user}","gists_url":"https://api.github.com/users/Metaswitch/gists{/gist_id}","starred_url":"https://api.github.com/users/Metaswitch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Metaswitch/subscriptions","organizations_url":"https://api.github.com/users/Metaswitch/orgs","repos_url":"https://api.github.com/users/Metaswitch/repos","events_url":"https://api.github.com/users/Metaswitch/events{/privacy}","received_events_url":"https://api.github.com/users/Metaswitch/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Metaswitch/calico","description":"Project Calico core repository.","fork":false,"url":"https://api.github.com/repos/Metaswitch/calico","forks_url":"https://api.github.com/repos/Metaswitch/calico/forks","keys_url":"https://api.github.com/repos/Metaswitch/calico/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Metaswitch/calico/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Metaswitch/calico/teams","hooks_url":"https://api.github.com/repos/Metaswitch/calico/hooks","issue_events_url":"https://api.github.com/repos/Metaswitch/calico/issues/events{/number}","events_url":"https://api.github.com/repos/Metaswitch/calico/events","assignees_url":"https://api.github.com/repos/Metaswitch/calico/assignees{/user}","branches_url":"https://api.github.com/repos/Metaswitch/calico/branches{/branch}","tags_url":"https://api.github.com/repos/Metaswitch/calico/tags","blobs_url":"https://api.github.com/repos/Metaswitch/calico/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Metaswitch/calico/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Metaswitch/calico/git/refs{/sha}","trees_url":"https://api.github.com/repos/Metaswitch/calico/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Metaswitch/calico/statuses/{sha}","languages_url":"https://api.github.com/repos/Metaswitch/calico/languages","stargazers_url":"https://api.github.com/repos/Metaswitch/calico/stargazers","contributors_url":"https://api.github.com/repos/Metaswitch/calico/contributors","subscribers_url":"https://api.github.com/repos/Metaswitch/calico/subscribers","subscription_url":"https://api.github.com/repos/Metaswitch/calico/subscription","commits_url":"https://api.github.com/repos/Metaswitch/calico/commits{/sha}","git_commits_url":"https://api.github.com/repos/Metaswitch/calico/git/commits{/sha}","comments_url":"https://api.github.com/repos/Metaswitch/calico/comments{/number}","issue_comment_url":"https://api.github.com/repos/Metaswitch/calico/issues/comments{/number}","contents_url":"https://api.github.com/repos/Metaswitch/calico/contents/{+path}","compare_url":"https://api.github.com/repos/Metaswitch/calico/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Metaswitch/calico/merges","archive_url":"https://api.github.com/repos/Metaswitch/calico/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Metaswitch/calico/downloads","issues_url":"https://api.github.com/repos/Metaswitch/calico/issues{/number}","pulls_url":"https://api.github.com/repos/Metaswitch/calico/pulls{/number}","milestones_url":"https://api.github.com/repos/Metaswitch/calico/milestones{/number}","notifications_url":"https://api.github.com/repos/Metaswitch/calico/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Metaswitch/calico/labels{/name}","releases_url":"https://api.github.com/repos/Metaswitch/calico/releases{/id}","created_at":"2014-06-26T14:08:43Z","updated_at":"2015-04-13T18:01:41Z","pushed_at":"2015-04-14T01:02:54Z","git_url":"git://github.com/Metaswitch/calico.git","ssh_url":"git@github.com:Metaswitch/calico.git","clone_url":"https://github.com/Metaswitch/calico.git","svn_url":"https://github.com/Metaswitch/calico","homepage":"http://projectcalico.org/","size":8764,"stargazers_count":34,"watchers_count":34,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":10,"mirror_url":null,"open_issues_count":62,"forks":10,"open_issues":62,"watchers":34,"default_branch":"master"}},"base":{"label":"Metaswitch:master","ref":"master","sha":"f6f673faa08c93293277b294100d78fbdcfa834f","user":{"login":"Metaswitch","id":453759,"avatar_url":"https://avatars.githubusercontent.com/u/453759?v=3","gravatar_id":"","url":"https://api.github.com/users/Metaswitch","html_url":"https://github.com/Metaswitch","followers_url":"https://api.github.com/users/Metaswitch/followers","following_url":"https://api.github.com/users/Metaswitch/following{/other_user}","gists_url":"https://api.github.com/users/Metaswitch/gists{/gist_id}","starred_url":"https://api.github.com/users/Metaswitch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Metaswitch/subscriptions","organizations_url":"https://api.github.com/users/Metaswitch/orgs","repos_url":"https://api.github.com/users/Metaswitch/repos","events_url":"https://api.github.com/users/Metaswitch/events{/privacy}","received_events_url":"https://api.github.com/users/Metaswitch/received_events","type":"Organization","site_admin":false},"repo":{"id":21242831,"name":"calico","full_name":"Metaswitch/calico","owner":{"login":"Metaswitch","id":453759,"avatar_url":"https://avatars.githubusercontent.com/u/453759?v=3","gravatar_id":"","url":"https://api.github.com/users/Metaswitch","html_url":"https://github.com/Metaswitch","followers_url":"https://api.github.com/users/Metaswitch/followers","following_url":"https://api.github.com/users/Metaswitch/following{/other_user}","gists_url":"https://api.github.com/users/Metaswitch/gists{/gist_id}","starred_url":"https://api.github.com/users/Metaswitch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Metaswitch/subscriptions","organizations_url":"https://api.github.com/users/Metaswitch/orgs","repos_url":"https://api.github.com/users/Metaswitch/repos","events_url":"https://api.github.com/users/Metaswitch/events{/privacy}","received_events_url":"https://api.github.com/users/Metaswitch/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Metaswitch/calico","description":"Project Calico core repository.","fork":false,"url":"https://api.github.com/repos/Metaswitch/calico","forks_url":"https://api.github.com/repos/Metaswitch/calico/forks","keys_url":"https://api.github.com/repos/Metaswitch/calico/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Metaswitch/calico/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Metaswitch/calico/teams","hooks_url":"https://api.github.com/repos/Metaswitch/calico/hooks","issue_events_url":"https://api.github.com/repos/Metaswitch/calico/issues/events{/number}","events_url":"https://api.github.com/repos/Metaswitch/calico/events","assignees_url":"https://api.github.com/repos/Metaswitch/calico/assignees{/user}","branches_url":"https://api.github.com/repos/Metaswitch/calico/branches{/branch}","tags_url":"https://api.github.com/repos/Metaswitch/calico/tags","blobs_url":"https://api.github.com/repos/Metaswitch/calico/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Metaswitch/calico/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Metaswitch/calico/git/refs{/sha}","trees_url":"https://api.github.com/repos/Metaswitch/calico/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Metaswitch/calico/statuses/{sha}","languages_url":"https://api.github.com/repos/Metaswitch/calico/languages","stargazers_url":"https://api.github.com/repos/Metaswitch/calico/stargazers","contributors_url":"https://api.github.com/repos/Metaswitch/calico/contributors","subscribers_url":"https://api.github.com/repos/Metaswitch/calico/subscribers","subscription_url":"https://api.github.com/repos/Metaswitch/calico/subscription","commits_url":"https://api.github.com/repos/Metaswitch/calico/commits{/sha}","git_commits_url":"https://api.github.com/repos/Metaswitch/calico/git/commits{/sha}","comments_url":"https://api.github.com/repos/Metaswitch/calico/comments{/number}","issue_comment_url":"https://api.github.com/repos/Metaswitch/calico/issues/comments{/number}","contents_url":"https://api.github.com/repos/Metaswitch/calico/contents/{+path}","compare_url":"https://api.github.com/repos/Metaswitch/calico/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Metaswitch/calico/merges","archive_url":"https://api.github.com/repos/Metaswitch/calico/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Metaswitch/calico/downloads","issues_url":"https://api.github.com/repos/Metaswitch/calico/issues{/number}","pulls_url":"https://api.github.com/repos/Metaswitch/calico/pulls{/number}","milestones_url":"https://api.github.com/repos/Metaswitch/calico/milestones{/number}","notifications_url":"https://api.github.com/repos/Metaswitch/calico/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Metaswitch/calico/labels{/name}","releases_url":"https://api.github.com/repos/Metaswitch/calico/releases{/id}","created_at":"2014-06-26T14:08:43Z","updated_at":"2015-04-13T18:01:41Z","pushed_at":"2015-04-14T01:02:54Z","git_url":"git://github.com/Metaswitch/calico.git","ssh_url":"git@github.com:Metaswitch/calico.git","clone_url":"https://github.com/Metaswitch/calico.git","svn_url":"https://github.com/Metaswitch/calico","homepage":"http://projectcalico.org/","size":8764,"stargazers_count":34,"watchers_count":34,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":10,"mirror_url":null,"open_issues_count":62,"forks":10,"open_issues":62,"watchers":34,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Metaswitch/calico/pulls/352"},"html":{"href":"https://github.com/Metaswitch/calico/pull/352"},"issue":{"href":"https://api.github.com/repos/Metaswitch/calico/issues/352"},"comments":{"href":"https://api.github.com/repos/Metaswitch/calico/issues/352/comments"},"review_comments":{"href":"https://api.github.com/repos/Metaswitch/calico/pulls/352/comments"},"review_comment":{"href":"https://api.github.com/repos/Metaswitch/calico/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Metaswitch/calico/pulls/352/commits"},"statuses":{"href":"https://api.github.com/repos/Metaswitch/calico/statuses/f8b6a61d5292fc76e8a110448273bd735dba95d0"}}}}