openstack
/
magnum
Code Issues Proposed changes

Add auth_url 

Url for keystone is needed by trust and other services, such as k8s
and docker registry.

Change-Id: I269332b5736b6c5a9bc85d843f0d03f1a4d059ee
Partially-Implements: blueprint create-trustee-user-for-each-bay
This commit is contained in:
Hua Wang 2016-02-29 19:38:51 +08:00
parent 0563743f4d
commit b79203aa98
11 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnum/conductor/template_definition.py
View File

@ -356,6 +356,7 @@ class BaseTemplateDefinition(TemplateDefinition):
extra_params['trustee_username'] = bay.trustee_username
extra_params['trustee_password'] = bay.trustee_password
extra_params['trust_id'] = bay.trust_id
extra_params['auth_url'] = context.auth_url
return super(BaseTemplateDefinition,
self).get_params(context, baymodel, bay,
@ -512,8 +513,6 @@ class AtomicK8sTemplateDefinition(K8sTemplateDefinition):
def get_params(self, context, baymodel, bay, **kwargs):
extra_params = kwargs.pop('extra_params', {})
# Kubernetes backend code is still using v2 API
extra_params['auth_url'] = context.auth_url.replace("v3", "v2")
extra_params['username'] = context.user_name
extra_params['tenant_name'] = context.tenant
osc = clients.OpenStackClients(context)

3
magnum/templates/kubernetes/fragments/write-kube-os-config.sh
View File

@ -4,6 +4,9 @@
KUBE_OS_CLOUD_CONFIG=/etc/sysconfig/kube_openstack_config
# kubernetes backend only support keystone v2 at this point
AUTH_URL=${AUTH_URL/v3/v2}
# Generate a the configuration for Kubernetes services
# to talk to OpenStack Neutron
cat > $KUBE_OS_CLOUD_CONFIG <<EOF

4
magnum/templates/kubernetes/kubecluster-coreos.yaml
View File

@ -142,6 +142,10 @@ parameters:
default: ""
hidden: true
auth_url:
type: string
description: url for keystone
resources:
######################################################################

3
magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml
View File

@ -88,8 +88,7 @@ parameters:
auth_url:
type: string
description: >
url for kubernetes to authenticate before sending request to neutron
description: url for keystone
username:
type: string

10
magnum/templates/kubernetes/kubecluster.yaml
View File

@ -176,12 +176,6 @@ parameters:
size fo the data segments for the swift dynamic large objects
default: 5242880
auth_url:
type: string
description: >
url for kubernetes to authenticate before sending request to neutron
must be v2 since kubernetes backend only suppor v2 at this point
username:
type: string
description: >
@ -276,6 +270,10 @@ parameters:
default: ""
hidden: true
auth_url:
type: string
description: url for keystone
resources:
######################################################################

9
magnum/templates/mesos/mesoscluster.yaml
View File

@ -115,11 +115,6 @@ parameters:
type: string
description: A logically separate section of the cluster
auth_url:
type: string
description: >
url for mesos to authenticate before sending request
username:
type: string
description: user name
@ -156,6 +151,10 @@ parameters:
other hosts are using the volume
default: "false"
auth_url:
type: string
description: url for keystone
resources:
######################################################################

4
magnum/templates/swarm/swarmcluster.yaml
View File

@ -173,6 +173,10 @@ parameters:
default: ""
hidden: true
auth_url:
type: string
description: url for keystone
resources:
######################################################################

16
magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
View File

@ -61,7 +61,7 @@ class TestBayConductorWithK8s(base.TestCase):
'trustee_username': 'fake_trustee',
'trustee_password': 'fake_trustee_password',
'trustee_user_id': '7b489f04-b458-4541-8179-6a48a553e656',
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de'
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
}
cfg.CONF.set_override('trustee_domain_id',
'3527620c-b220-4f37-9ebc-6e63a81a9b2f',
@ -141,7 +141,6 @@ class TestBayConductorWithK8s(base.TestCase):
'http_proxy': 'http_proxy',
'https_proxy': 'https_proxy',
'no_proxy': 'no_proxy',
'auth_url': 'http://192.168.10.10:5000/v2',
'tenant_name': 'fake_tenant',
'username': 'fake_user',
'user_token': 'fake_token',
@ -152,7 +151,8 @@ class TestBayConductorWithK8s(base.TestCase):
'trustee_username': 'fake_trustee',
'trustee_password': 'fake_trustee_password',
'trustee_user_id': '7b489f04-b458-4541-8179-6a48a553e656',
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de'
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
'auth_url': 'http://192.168.10.10:5000/v3'
}
if missing_attr is not None:
expected.pop(mapping[missing_attr], None)
@ -194,7 +194,8 @@ class TestBayConductorWithK8s(base.TestCase):
'trustee_username': 'fake_trustee',
'trustee_password': 'fake_trustee_password',
'trustee_user_id': '7b489f04-b458-4541-8179-6a48a553e656',
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de'
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
'auth_url': 'http://192.168.10.10:5000/v3'
}
self.assertEqual(expected, definition)
@ -238,7 +239,8 @@ class TestBayConductorWithK8s(base.TestCase):
'trustee_username': 'fake_trustee',
'trustee_password': 'fake_trustee_password',
'trustee_user_id': '7b489f04-b458-4541-8179-6a48a553e656',
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de'
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
'auth_url': 'http://192.168.10.10:5000/v3'
}
self.assertEqual(expected, definition)
@ -346,7 +348,6 @@ class TestBayConductorWithK8s(base.TestCase):
'flannel_network_cidr': '10.101.0.0/16',
'flannel_network_subnetlen': '26',
'flannel_use_vxlan': 'yes',
'auth_url': 'http://192.168.10.10:5000/v2',
'tenant_name': 'fake_tenant',
'username': 'fake_user',
'user_token': 'fake_token',
@ -357,7 +358,8 @@ class TestBayConductorWithK8s(base.TestCase):
'trustee_username': 'fake_trustee',
'trustee_password': 'fake_trustee_password',
'trustee_user_id': '7b489f04-b458-4541-8179-6a48a553e656',
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de'
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
'auth_url': 'http://192.168.10.10:5000/v3'
}
self.assertEqual(expected, definition)
reqget.assert_called_once_with('http://etcd/test?size=1')

2
magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
View File

@ -55,7 +55,7 @@ class TestBayConductorWithMesos(base.TestCase):
'trustee_username': 'fake_trustee',
'trustee_password': 'fake_trustee_password',
'trustee_user_id': '7b489f04-b458-4541-8179-6a48a553e656',
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de'
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
}
cfg.CONF.set_override('trustee_domain_id',
'3527620c-b220-4f37-9ebc-6e63a81a9b2f',

7
magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
View File

@ -73,6 +73,7 @@ class TestBayConductorWithSwarm(base.TestCase):
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')
def test_extract_template_definition_all_values(
@ -112,7 +113,8 @@ class TestBayConductorWithSwarm(base.TestCase):
'trustee_username': 'fake_trustee',
'trustee_password': 'fake_trustee_password',
'trustee_user_id': '7b489f04-b458-4541-8179-6a48a553e656',
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de'
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
'auth_url': 'http://192.168.10.10:5000/v3'
}
self.assertEqual(expected, definition)
@ -154,7 +156,8 @@ class TestBayConductorWithSwarm(base.TestCase):
'trustee_username': 'fake_trustee',
'trustee_password': 'fake_trustee_password',
'trustee_user_id': '7b489f04-b458-4541-8179-6a48a553e656',
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de'
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
'auth_url': 'http://192.168.10.10:5000/v3'
}
self.assertEqual(expected, definition)

2
magnum/tests/unit/conductor/test_template_definition.py
View File

@ -206,7 +206,6 @@ class AtomicK8sTemplateDefinitionTestCase(base.TestCase):
'flannel_network_cidr': flannel_cidr,
'flannel_use_vxlan': flannel_subnet,
'flannel_network_subnetlen': flannel_vxlan,
'auth_url': 'http://192.168.10.10:5000/v2',
'username': 'fake_user',
'tenant_name': 'fake_tenant',
'magnum_url': mock_osc.magnum_url.return_value,
@ -258,7 +257,6 @@ class AtomicK8sTemplateDefinitionTestCase(base.TestCase):
'flannel_network_cidr': flannel_cidr,
'flannel_use_vxlan': flannel_subnet,
'flannel_network_subnetlen': flannel_vxlan,
'auth_url': 'http://192.168.10.10:5000/v2',
'username': 'fake_user',
'tenant_name': 'fake_tenant',
'magnum_url': mock_osc.magnum_url.return_value,