1
=== added directory 'templates/mitaka'
2
=== added file 'templates/mitaka/nova.conf'
3
--- templates/mitaka/nova.conf	1970-01-01 00:00:00 +0000
4
+++ templates/mitaka/nova.conf	2016-02-17 11:43:41 +0000
5
@@ -0,0 +1,34 @@
6
1
# mitaka
7
2
###############################################################################
8
3
# [ WARNING ]
9
4
# Configuration file maintained by Juju. Local changes may be overwritten.
10
5
###############################################################################
11
6
[DEFAULT]
12
7
logdir=/var/log/nova
13
8
state_path=/var/lib/nova
14
9
root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
15
10
verbose= {{ verbose }}
16
11
use_syslog = {{ use_syslog }}
17
12
api_paste_config=/etc/nova/api-paste.ini
18
13
enabled_apis=metadata
19
14
multi_host=True
20
15
# Access to neutron API services
21
16
network_api_class=nova.network.neutronv2.api.API
22
17
23
18
{% include "section-zeromq" %}
24
19
25
20
[neutron]
26
21
url={{ quantum_url }}
27
22
auth_plugin=password
28
23
project_name={{ service_tenant }}
29
24
username={{ service_username }}
30
25
password={{ service_password }}
31
26
auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}
32
27
region={{ region }}
33
28
service_metadata_proxy=True
34
29
metadata_proxy_shared_secret={{ shared_secret }}
35
30
36
31
{% include "section-rabbitmq-oslo" %}
37
32
38
33
[oslo_concurrency]
39
34
lock_path=/var/lock/nova
40
0
35
41
=== modified file 'tests/basic_deployment.py'
42
--- tests/basic_deployment.py	2016-01-22 04:29:30 +0000
43
+++ tests/basic_deployment.py	2016-02-17 11:43:41 +0000
44
@@ -193,6 +193,10 @@
45
193
                            'nova-scheduler',
193
                            'nova-scheduler',
46
194
                            'nova-conductor']
194
                            'nova-conductor']
47
195
195
48
196
        if self._get_openstack_release_string() >= 'liberty':
49
197
            nova_cc_services.remove('nova-api-ec2')
50
198
            nova_cc_services.remove('nova-objectstore')
51
199
52
196
        commands = {
200
        commands = {
53
197
            self.mysql_sentry: ['mysql'],
201
            self.mysql_sentry: ['mysql'],
54
198
            self.keystone_sentry: ['keystone'],
202
            self.keystone_sentry: ['keystone'],
55
@@ -874,16 +878,29 @@
56
874
            expected['oslo_concurrency'] = {
878
            expected['oslo_concurrency'] = {
57
875
                'lock_path': '/var/lock/nova'
879
                'lock_path': '/var/lock/nova'
58
876
            }
880
            }
69
877
            expected['neutron'] = {
881
            if self._get_openstack_release() >= self.trusty_mitaka:
70
878
                'auth_strategy': 'keystone',
882
                expected['neutron'] = {
71
879
                'url': nova_cc_relation['quantum_url'],
883
                    'url': nova_cc_relation['quantum_url'],
72
880
                'admin_tenant_name': 'services',
884
                    'auth_plugin': 'password',
73
881
                'admin_username': 'nova',
885
                    'project_name': 'services',
74
882
                'admin_password': nova_cc_relation['service_password'],
886
                    'username': 'nova',
75
883
                'admin_auth_url': ep,
887
                    'password': nova_cc_relation['service_password'],
76
884
                'service_metadata_proxy': 'True',
888
                    'auth_url': ep.split('/v')[0],
77
885
                'metadata_proxy_shared_secret': u.not_null
889
                    'region': 'RegionOne',
78
886
            }
890
                    'service_metadata_proxy': 'True',
79
891
                    'metadata_proxy_shared_secret': u.not_null
80
892
                }
81
893
            else:
82
894
                expected['neutron'] = {
83
895
                    'auth_strategy': 'keystone',
84
896
                    'url': nova_cc_relation['quantum_url'],
85
897
                    'admin_tenant_name': 'services',
86
898
                    'admin_username': 'nova',
87
899
                    'admin_password': nova_cc_relation['service_password'],
88
900
                    'admin_auth_url': ep,
89
901
                    'service_metadata_proxy': 'True',
90
902
                    'metadata_proxy_shared_secret': u.not_null
91
903
                }
92
887
        else:
904
        else:
93
888
            # Juno or earlier
905
            # Juno or earlier
94
889
            expected['DEFAULT'].update({
906
            expected['DEFAULT'].update({
Reviewer	Date Requested	Status
David Ames (community)	2016-02-12	Approve on 2016-02-17
Ryan Beisner (community)		Approve on 2016-02-17
Review via email: mp+285862@code.launchpad.net