Move Calico Felix upstream to defaults

Based on discussion in the Ocata backport of
I9c3cb1a11319f692113badf4d49bc8903effcbd7, these vars are being moved
to the defaults so they can be more easily overridden.

This will be combined into the backport patch for consistency.

Change-Id: I42a68601b3e3c6035080650caaf30ce9bc2bf712

defaults/main.yml

@@ -346,6 +346,12 @@ neutron_octavia_request_poll_timeout: 100
 # neutron-server
 neutron_management_ip: 127.0.0.1
 
+# Calico Felix agent upstream settings
+calico_felix_url: "https://github.com/projectcalico/felix/releases/download/{{ calico_felix_version }}/calico-felix"
+calico_felix_version: 2.3.0
+calico_felix_sha256: 6cc538d6d93d2b5e732841769f427ce61a4e7d9a6eedf4ca8d33c4df42cf6419
+calico_felix_validate_certs: yes
+
 # Database specific configuration
 dragonflow_remote_db_ip: 127.0.0.1 # etcd has local proxy installed
 dragonflow_remote_db_port: 4001

vars/main.yml

@@ -40,12 +40,8 @@ neutron_package_list: |-
   {% endif %}
   {{ packages }}
 
-# Set the Calico Felix agent URL information
-calico_felix_url: "https://github.com/projectcalico/felix/releases/download/{{ calico_felix_version }}/calico-felix"
-calico_felix_version: 2.3.0
-calico_felix_sha256: 6cc538d6d93d2b5e732841769f427ce61a4e7d9a6eedf4ca8d33c4df42cf6419
+# Set the Calico Felix agent executable destination path
 calico_felix_bin: /usr/local/bin/calico-felix
-calico_felix_validate_certs: yes
 
 ###
 ### Python code details