Use fully qualified basepython for py{35,36} targets
Make sure the exact python version is used for specific python unit testing targets. Update functional tests to include nova-cloud-controller. Change-Id: I8d57719fce4f152a105d8a61c08b556873105708
This commit is contained in:
parent
7cf4f91765
commit
fd331820d0
@ -76,6 +76,7 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
|
|||||||
{'name': 'glance'},
|
{'name': 'glance'},
|
||||||
{'name': 'cinder'},
|
{'name': 'cinder'},
|
||||||
{'name': 'cinder-ceph'},
|
{'name': 'cinder-ceph'},
|
||||||
|
{'name': 'nova-cloud-controller'},
|
||||||
]
|
]
|
||||||
super(CephBasicDeployment, self)._add_services(this_service,
|
super(CephBasicDeployment, self)._add_services(this_service,
|
||||||
other_services)
|
other_services)
|
||||||
@ -98,6 +99,13 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
|
|||||||
'cinder-ceph:storage-backend': 'cinder:storage-backend',
|
'cinder-ceph:storage-backend': 'cinder:storage-backend',
|
||||||
'cinder-ceph:ceph': 'ceph-mon:client',
|
'cinder-ceph:ceph': 'ceph-mon:client',
|
||||||
'ceph-osd:mon': 'ceph-mon:osd',
|
'ceph-osd:mon': 'ceph-mon:osd',
|
||||||
|
'nova-cloud-controller:shared-db': 'percona-cluster:shared-db',
|
||||||
|
'nova-cloud-controller:amqp': 'rabbitmq-server:amqp',
|
||||||
|
'nova-cloud-controller:identity-service': 'keystone:'
|
||||||
|
'identity-service',
|
||||||
|
'nova-cloud-controller:cloud-compute': 'nova-compute:'
|
||||||
|
'cloud-compute',
|
||||||
|
'nova-cloud-controller:image-service': 'glance:image-service',
|
||||||
}
|
}
|
||||||
super(CephBasicDeployment, self)._add_relations(relations)
|
super(CephBasicDeployment, self)._add_relations(relations)
|
||||||
|
|
||||||
|
4
tox.ini
4
tox.ini
@ -27,12 +27,12 @@ commands = /bin/true
|
|||||||
|
|
||||||
; keep zuul happy until we change the py35 job
|
; keep zuul happy until we change the py35 job
|
||||||
[testenv:py35]
|
[testenv:py35]
|
||||||
basepython = python3
|
basepython = python3.5
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:py36]
|
[testenv:py36]
|
||||||
basepython = python3
|
basepython = python3.6
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user