0005-Use-trust-for-tls-cert-generation-in-swarm.patch 20 KB
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498
From 7b8dd03f99a2b24fb00ef014615fe6c027bbb601 Mon Sep 17 00:00:00 2001
From: Hua Wang <wanghua.humble@gmail.com>
Date: Thu, 24 Mar 2016 15:26:06 +0800
Subject: [PATCH 5/8] Use trust for tls cert generation in swarm

Currently, we use the users auth token, which expires after a while.
We need to use a trust instead.

Remove user_token at the same time.

Change-Id: Id1d34c59eccd70be24c5b9e00cd921b5a9d59860
Partially-Implements: blueprint use-trust-for-tls-cert-generation
---
 magnum/conductor/template_definition.py            | 16 ----------
 .../kubernetes/fragments/write-heat-params.yaml    |  1 -
 magnum/templates/kubernetes/kubecluster.yaml       |  6 ----
 magnum/templates/kubernetes/kubemaster.yaml        |  5 ---
 magnum/templates/kubernetes/kubeminion.yaml        |  5 ---
 magnum/templates/swarm/fragments/make-cert.py      | 37 ++++++++++++++++++++++
 .../templates/swarm/fragments/write-heat-params.sh |  4 +++
 magnum/templates/swarm/swarmcluster.yaml           | 14 ++++----
 magnum/templates/swarm/swarmmaster.yaml            | 30 +++++++++++++++---
 magnum/templates/swarm/swarmnode.yaml              | 27 +++++++++++++---
 .../conductor/handlers/test_k8s_bay_conductor.py   |  5 ---
 .../conductor/handlers/test_swarm_bay_conductor.py |  4 ---
 .../unit/conductor/test_template_definition.py     |  5 +--
 13 files changed, 97 insertions(+), 62 deletions(-)

diff --git a/magnum/conductor/template_definition.py b/magnum/conductor/template_definition.py
index d12b6c9..8832307 100644
--- a/magnum/conductor/template_definition.py
+++ b/magnum/conductor/template_definition.py
@@ -363,20 +363,6 @@ class BaseTemplateDefinition(TemplateDefinition):
                                       extra_params=extra_params,
                                       **kwargs)
 
-    def _get_user_token(self, context, osc, bay):
-        """Retrieve user token from the Heat stack or context.
-
-        :param context: The security context
-        :param osc: The openstack client
-        :param bay: The bay
-        :return: A user token
-        """
-        if hasattr(bay, 'stack_id'):
-            stack = osc.heat().stacks.get(bay.stack_id)
-            return stack.parameters['user_token']
-        else:
-            return context.auth_token
-
     def get_discovery_url(self, bay):
         if hasattr(bay, 'discovery_url') and bay.discovery_url:
             discovery_url = bay.discovery_url
@@ -516,7 +502,6 @@ class AtomicK8sTemplateDefinition(K8sTemplateDefinition):
         extra_params['username'] = context.user_name
         extra_params['tenant_name'] = context.tenant
         osc = clients.OpenStackClients(context)
-        extra_params['user_token'] = self._get_user_token(context, osc, bay)
         extra_params['magnum_url'] = osc.magnum_url()
 
         if baymodel.tls_disabled:
@@ -594,7 +579,6 @@ class AtomicSwarmTemplateDefinition(BaseTemplateDefinition):
         # it should be replaced with an actual trust token with only
         # access to do what the template needs it to do.
         osc = clients.OpenStackClients(context)
-        extra_params['user_token'] = self._get_user_token(context, osc, bay)
         extra_params['magnum_url'] = osc.magnum_url()
 
         label_list = ['flannel_network_cidr', 'flannel_use_vxlan',
diff --git a/magnum/templates/kubernetes/fragments/write-heat-params.yaml b/magnum/templates/kubernetes/fragments/write-heat-params.yaml
index 23747ce..d3430dd 100644
--- a/magnum/templates/kubernetes/fragments/write-heat-params.yaml
+++ b/magnum/templates/kubernetes/fragments/write-heat-params.yaml
@@ -25,7 +25,6 @@ write_files:
       REGISTRY_CHUNKSIZE="$REGISTRY_CHUNKSIZE"
       TLS_DISABLED="$TLS_DISABLED"
       BAY_UUID="$BAY_UUID"
-      USER_TOKEN="$USER_TOKEN"
       MAGNUM_URL="$MAGNUM_URL"
       HTTP_PROXY="$HTTP_PROXY"
       HTTPS_PROXY="$HTTPS_PROXY"
diff --git a/magnum/templates/kubernetes/kubecluster.yaml b/magnum/templates/kubernetes/kubecluster.yaml
index ff7bd1d..7817687 100644
--- a/magnum/templates/kubernetes/kubecluster.yaml
+++ b/magnum/templates/kubernetes/kubecluster.yaml
@@ -216,10 +216,6 @@ parameters:
       service.
     default: 6443
 
-  user_token:
-    type: string
-    description: token used for communicating back to Magnum for TLS certs
-
   bay_uuid:
     type: string
     description: identifier for the bay this template is generating
@@ -304,7 +300,6 @@ resources:
           flannel_use_vxlan: {get_param: flannel_use_vxlan}
           portal_network_cidr: {get_param: portal_network_cidr}
           discovery_url: {get_param: discovery_url}
-          user_token: {get_param: user_token}
           bay_uuid: {get_param: bay_uuid}
           magnum_url: {get_param: magnum_url}
           fixed_network: ""
@@ -365,7 +360,6 @@ resources:
           registry_container: {get_param: registry_container}
           registry_insecure: {get_param: registry_insecure}
           registry_chunksize: {get_param: registry_chunksize}
-          user_token: {get_param: user_token}
           bay_uuid: {get_param: bay_uuid}
           magnum_url: {get_param: magnum_url}
           kubernetes_port: {get_param: kubernetes_port}
diff --git a/magnum/templates/kubernetes/kubemaster.yaml b/magnum/templates/kubernetes/kubemaster.yaml
index 59c86ff..8185618 100644
--- a/magnum/templates/kubernetes/kubemaster.yaml
+++ b/magnum/templates/kubernetes/kubemaster.yaml
@@ -82,10 +82,6 @@ parameters:
       service.
     default: 6443
 
-  user_token:
-    type: string
-    description: token used for communicating back to Magnum for TLS certs
-
   bay_uuid:
     type: string
     description: identifier for the bay this template is generating
@@ -216,7 +212,6 @@ resources:
             "$CLUSTER_SUBNET": {get_param: fixed_subnet}
             "$TLS_DISABLED": {get_param: tls_disabled}
             "$BAY_UUID": {get_param: bay_uuid}
-            "$USER_TOKEN": {get_param: user_token}
             "$MAGNUM_URL": {get_param: magnum_url}
             "$HTTP_PROXY": {get_param: http_proxy}
             "$HTTPS_PROXY": {get_param: https_proxy}
diff --git a/magnum/templates/kubernetes/kubeminion.yaml b/magnum/templates/kubernetes/kubeminion.yaml
index 5c070b5..3322142 100644
--- a/magnum/templates/kubernetes/kubeminion.yaml
+++ b/magnum/templates/kubernetes/kubeminion.yaml
@@ -52,10 +52,6 @@ parameters:
       service.
     default: 6443
 
-  user_token:
-    type: string
-    description: token used for communicating back to Magnum for TLS certs
-
   bay_uuid:
     type: string
     description: identifier for the bay this template is generating
@@ -233,7 +229,6 @@ resources:
             $REGISTRY_CHUNKSIZE: {get_param: registry_chunksize}
             $TLS_DISABLED: {get_param: tls_disabled}
             $BAY_UUID: {get_param: bay_uuid}
-            $USER_TOKEN: {get_param: user_token}
             $MAGNUM_URL: {get_param: magnum_url}
             $HTTP_PROXY: {get_param: http_proxy}
             $HTTPS_PROXY: {get_param: https_proxy}
diff --git a/magnum/templates/swarm/fragments/make-cert.py b/magnum/templates/swarm/fragments/make-cert.py
index c2d20d0..0194d11 100644
--- a/magnum/templates/swarm/fragments/make-cert.py
+++ b/magnum/templates/swarm/fragments/make-cert.py
@@ -132,10 +132,47 @@ def write_server_cert(config, csr_req):
         fp.write(csr_resp.json()['pem'])
 
 
+def get_user_token(config):
+    creds_str = '''
+{
+    "auth": {
+        "identity": {
+            "methods": [
+                "password"
+            ],
+            "password": {
+                "user": {
+                    "id": "%(trustee_user_id)s",
+                    "password": "%(trustee_password)s"
+                }
+            }
+        },
+        "scope": {
+            "OS-TRUST:trust": {
+                "id": "%(trust_id)s"
+            }
+        }
+    }
+}
+'''
+    params = {
+        'trustee_user_id': config['TRUSTEE_USER_ID'],
+        'trustee_password': config['TRUSTEE_PASSWORD'],
+        'trust_id': config['TRUST_ID']
+    }
+    creds = creds_str % params
+    headers = {'Content-Type': 'application/json'}
+    url = config['AUTH_URL'].replace('v2.0', 'v3') + '/auth/tokens'
+    r = requests.post(url, headers=headers, data=creds)
+    config['USER_TOKEN'] = r.headers['X-Subject-Token']
+    return config
+
+
 def main():
     config = load_config()
     if config['TLS_DISABLED'] == 'False':
         create_dirs()
+        config = get_user_token(config)
         write_ca_cert(config)
         write_server_key()
         csr_req = create_server_csr(config)
diff --git a/magnum/templates/swarm/fragments/write-heat-params.sh b/magnum/templates/swarm/fragments/write-heat-params.sh
index fc799c9..2eaab88 100644
--- a/magnum/templates/swarm/fragments/write-heat-params.sh
+++ b/magnum/templates/swarm/fragments/write-heat-params.sh
@@ -26,6 +26,10 @@ ETCD_SERVER_IP="${ETCD_SERVER_IP_TMP:-$(hostname -I | cut -d' ' -f1)}"
 API_IP_ADDRESS="${API_IP_ADDRESS_TMP:-$(hostname -I | cut -d' ' -f1)}"
 SWARM_VERSION="$SWARM_VERSION"
 AGENT_WAIT_HANDLE="$AGENT_WAIT_HANDLE"
+TRUSTEE_USER_ID="$TRUSTEE_USER_ID"
+TRUSTEE_PASSWORD="$TRUSTEE_PASSWORD"
+TRUST_ID="$TRUST_ID"
+AUTH_URL="$AUTH_URL"
 END_SERVICE
 
 chown root:root /etc/sysconfig/heat-params
diff --git a/magnum/templates/swarm/swarmcluster.yaml b/magnum/templates/swarm/swarmcluster.yaml
index 4b5e515..daf19be 100644
--- a/magnum/templates/swarm/swarmcluster.yaml
+++ b/magnum/templates/swarm/swarmcluster.yaml
@@ -25,10 +25,6 @@ parameters:
     type: string
     description: url provided for node discovery
 
-  user_token:
-    type: string
-    description: token used for communicating back to Magnum for TLS certs
-
   bay_uuid:
     type: string
     description: identifier for the bay this template is generating
@@ -206,7 +202,6 @@ resources:
           no_proxy: {get_param: no_proxy}
           swarm_api_ip: ""
           bay_uuid: {get_param: bay_uuid}
-          user_token: {get_param: user_token}
           magnum_url: {get_param: magnum_url}
           tls_disabled: {get_param: tls_disabled}
           secgroup_swarm_master_id: ""
@@ -220,6 +215,10 @@ resources:
           etcd_server_ip: ""
           api_ip_address: ""
           swarm_version: {get_param: swarm_version}
+          trustee_user_id: {get_param: trustee_user_id}
+          trustee_password: {get_param: trustee_password}
+          trust_id: {get_param: trust_id}
+          auth_url: {get_param: auth_url}
 
   swarm_nodes:
     type: "OS::Heat::ResourceGroup"
@@ -243,7 +242,6 @@ resources:
           no_proxy: {get_param: no_proxy}
           swarm_api_ip: {get_attr: [swarm_masters, swarm_master_external_ip, 0]}
           bay_uuid: {get_param: bay_uuid}
-          user_token: {get_param: user_token}
           magnum_url: {get_param: magnum_url}
           tls_disabled: {get_param: tls_disabled}
           secgroup_swarm_node_id: ""
@@ -251,6 +249,10 @@ resources:
           etcd_server_ip: {get_attr: [swarm_masters, swarm_master_external_ip, 0]}
           api_ip_address: {get_attr: [swarm_masters, swarm_master_external_ip, 0]}
           swarm_version: {get_param: swarm_version}
+          trustee_user_id: {get_param: trustee_user_id}
+          trustee_password: {get_param: trustee_password}
+          trust_id: {get_param: trust_id}
+          auth_url: {get_param: auth_url}
 
 outputs:
 
diff --git a/magnum/templates/swarm/swarmmaster.yaml b/magnum/templates/swarm/swarmmaster.yaml
index 335e082..9ce65a3 100644
--- a/magnum/templates/swarm/swarmmaster.yaml
+++ b/magnum/templates/swarm/swarmmaster.yaml
@@ -24,10 +24,6 @@ parameters:
     type: string
     description: url provided for node discovery
 
-  user_token:
-    type: string
-    description: token used for communicating back to Magnum for TLS certs
-
   bay_uuid:
     type: string
     description: identifier for the bay this template is generating
@@ -121,6 +117,27 @@ parameters:
     type: string
     description: ip address of the load balancer pool of etcd server.
 
+  trustee_user_id:
+    type: string
+    description: user id of the trustee
+    default: ""
+
+  trustee_password:
+    type: string
+    description: password of the trustee
+    default: ""
+    hidden: true
+
+  trust_id:
+    type: string
+    description: id of the trust which is used by the trustee
+    default: ""
+    hidden: true
+
+  auth_url:
+    type: string
+    description: url for keystone
+
 resources:
 
   cloud_init_wait_handle:
@@ -169,7 +186,6 @@ resources:
             "$SWARM_API_IP": {get_param: swarm_api_ip}
             "$SWARM_NODE_IP":
             "$BAY_UUID": {get_param: bay_uuid}
-            "$USER_TOKEN": {get_param: user_token}
             "$MAGNUM_URL": {get_param: magnum_url}
             "$TLS_DISABLED": {get_param: tls_disabled}
             "$NETWORK_DRIVER": {get_param: network_driver}
@@ -179,6 +195,10 @@ resources:
             "$ETCD_SERVER_IP": {get_param: etcd_server_ip}
             "$API_IP_ADDRESS": {get_param: api_ip_address}
             "$SWARM_VERSION": {get_param: swarm_version}
+            "$TRUSTEE_USER_ID": {get_param: trustee_user_id}
+            "$TRUSTEE_PASSWORD": {get_param: trustee_password}
+            "$TRUST_ID": {get_param: trust_id}
+            "$AUTH_URL": {get_param: auth_url}
 
   write_network_config:
     type: "OS::Heat::SoftwareConfig"
diff --git a/magnum/templates/swarm/swarmnode.yaml b/magnum/templates/swarm/swarmnode.yaml
index 246a71e..2c4f0b4 100644
--- a/magnum/templates/swarm/swarmnode.yaml
+++ b/magnum/templates/swarm/swarmnode.yaml
@@ -65,10 +65,6 @@ parameters:
     type: string
     description: swarm master's api server public ip address
 
-  user_token:
-    type: string
-    description: token used for communicating back to Magnum for TLS certs
-
   bay_uuid:
     type: string
     description: identifier for the bay this template is generating
@@ -93,6 +89,24 @@ parameters:
     type: string
     description: ip address of the load balancer pool of etcd server.
 
+  trustee_user_id:
+    type: string
+    description: user id of the trustee
+
+  trustee_password:
+    type: string
+    description: password of the trustee
+    hidden: true
+
+  trust_id:
+    type: string
+    description: id of the trust which is used by the trustee
+    hidden: true
+
+  auth_url:
+    type: string
+    description: url for keystone
+
 resources:
 
   node_cloud_init_wait_handle:
@@ -139,7 +153,6 @@ resources:
             "$SWARM_API_IP": {get_param: swarm_api_ip}
             "$SWARM_NODE_IP":
             "$BAY_UUID": {get_param: bay_uuid}
-            "$USER_TOKEN": {get_param: user_token}
             "$MAGNUM_URL": {get_param: magnum_url}
             "$TLS_DISABLED": {get_param: tls_disabled}
             "$NETWORK_DRIVER": {get_param: network_driver}
@@ -147,6 +160,10 @@ resources:
             "$API_IP_ADDRESS": {get_param: api_ip_address}
             "$SWARM_VERSION": {get_param: swarm_version}
             "$AGENT_WAIT_HANDLE": {get_resource: node_agent_wait_handle}
+            "$TRUSTEE_USER_ID": {get_param: trustee_user_id}
+            "$TRUSTEE_PASSWORD": {get_param: trustee_password}
+            "$TRUST_ID": {get_param: trust_id}
+            "$AUTH_URL": {get_param: auth_url}
 
   remove_docker_key:
     type: "OS::Heat::SoftwareConfig"
diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
index 6964165..7f2e2c3 100644
--- a/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
@@ -75,8 +75,6 @@ class TestBayConductorWithK8s(base.TestCase):
         self.mock_osc = mock.MagicMock()
         self.mock_osc.magnum_url.return_value = 'http://127.0.0.1:9511/v1'
         self.mock_osc_class.return_value = self.mock_osc
-        mock_stack = self.mock_osc.heat.return_value.stacks.get.return_value
-        mock_stack.parameters = {'user_token': 'fake_token'}
 
     @patch('magnum.objects.BayModel.get_by_uuid')
     def test_extract_template_definition(
@@ -118,7 +116,6 @@ class TestBayConductorWithK8s(base.TestCase):
             'http_proxy': 'http_proxy',
             'https_proxy': 'https_proxy',
             'no_proxy': 'no_proxy',
-            'user_token': self.context.auth_token,
             'bay_uuid': self.bay_dict['uuid'],
             'magnum_url': self.mock_osc.magnum_url.return_value,
             'tls_disabled': False,
@@ -143,7 +140,6 @@ class TestBayConductorWithK8s(base.TestCase):
             'no_proxy': 'no_proxy',
             'tenant_name': 'fake_tenant',
             'username': 'fake_user',
-            'user_token': 'fake_token',
             'bay_uuid': self.bay_dict['uuid'],
             'magnum_url': self.mock_osc.magnum_url.return_value,
             'tls_disabled': False,
@@ -350,7 +346,6 @@ class TestBayConductorWithK8s(base.TestCase):
             'flannel_use_vxlan': 'yes',
             'tenant_name': 'fake_tenant',
             'username': 'fake_user',
-            'user_token': 'fake_token',
             'bay_uuid': self.bay_dict['uuid'],
             'magnum_url': self.mock_osc.magnum_url.return_value,
             'tls_disabled': False,
diff --git a/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
index 284f4a5..5858fd0 100644
--- a/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
@@ -71,8 +71,6 @@ class TestBayConductorWithSwarm(base.TestCase):
         self.mock_osc = mock.MagicMock()
         self.mock_osc.magnum_url.return_value = 'http://127.0.0.1:9511/v1'
         self.mock_osc_class.return_value = self.mock_osc
-        mock_stack = self.mock_osc.heat.return_value.stacks.get.return_value
-        mock_stack.parameters = {'user_token': 'fake_token'}
         self.context.auth_url = 'http://192.168.10.10:5000/v3'
 
     @patch('magnum.objects.BayModel.get_by_uuid')
@@ -101,7 +99,6 @@ class TestBayConductorWithSwarm(base.TestCase):
             'http_proxy': 'http_proxy',
             'https_proxy': 'https_proxy',
             'no_proxy': 'no_proxy',
-            'user_token': 'fake_token',
             'bay_uuid': 'some_uuid',
             'magnum_url': self.mock_osc.magnum_url.return_value,
             'tls_disabled': False,
@@ -145,7 +142,6 @@ class TestBayConductorWithSwarm(base.TestCase):
             'number_of_masters': 1,
             'number_of_nodes': 1,
             'discovery_url': 'https://discovery.etcd.io/test',
-            'user_token': 'fake_token',
             'bay_uuid': 'some_uuid',
             'magnum_url': self.mock_osc.magnum_url.return_value,
             'tls_disabled': False,
diff --git a/magnum/tests/unit/conductor/test_template_definition.py b/magnum/tests/unit/conductor/test_template_definition.py
index 06b57ca..add6756 100644
--- a/magnum/tests/unit/conductor/test_template_definition.py
+++ b/magnum/tests/unit/conductor/test_template_definition.py
@@ -208,8 +208,7 @@ class AtomicK8sTemplateDefinitionTestCase(base.TestCase):
             'flannel_network_subnetlen': flannel_vxlan,
             'username': 'fake_user',
             'tenant_name': 'fake_tenant',
-            'magnum_url': mock_osc.magnum_url.return_value,
-            'user_token': mock_context.auth_token}}
+            'magnum_url': mock_osc.magnum_url.return_value}}
         mock_get_params.assert_called_once_with(mock_context, mock_baymodel,
                                                 mock_bay, **expected_kwargs)
 
@@ -260,7 +259,6 @@ class AtomicK8sTemplateDefinitionTestCase(base.TestCase):
             'username': 'fake_user',
             'tenant_name': 'fake_tenant',
             'magnum_url': mock_osc.magnum_url.return_value,
-            'user_token': mock_context.auth_token,
             'loadbalancing_protocol': 'HTTP',
             'kubernetes_port': 8080}}
         mock_get_params.assert_called_once_with(mock_context, mock_baymodel,
@@ -426,7 +424,6 @@ class AtomicSwarmTemplateDefinitionTestCase(base.TestCase):
 
         expected_kwargs = {'extra_params': {
             'discovery_url': 'fake_discovery_url',
-            'user_token': mock_context.auth_token,
             'magnum_url': mock_osc.magnum_url.return_value,
             'flannel_network_cidr': flannel_cidr,
             'flannel_use_vxlan': flannel_subnet,
-- 
2.5.5