1
=== modified file 'config.yaml'
2
--- config.yaml	2015-11-16 09:14:33 +0000
3
+++ config.yaml	2016-01-05 15:04:28 +0000
4
@@ -40,6 +40,13 @@
5
40
    default: heat
40
    default: heat
6
41
    type: string
41
    type: string
7
42
    description: Database name
42
    description: Database name
8
43
  instance-user:
9
44
    default:
10
45
    type: string
11
46
    description: |
12
47
      The default user for new instances. This option is deprecated as of Juno.
13
48
      If left empty, Heat will use the default user set up with your cloud
14
49
      image (for OS::Nova::Server) or 'ec2-user' (for AWS::EC2::Instance).
15
43
  region:
50
  region:
16
44
    default: RegionOne
51
    default: RegionOne
17
45
    type: string
52
    type: string
18
46
53
19
=== modified file 'hooks/heat_context.py'
20
--- hooks/heat_context.py	2015-04-02 12:25:23 +0000
21
+++ hooks/heat_context.py	2016-01-05 15:04:28 +0000
22
@@ -96,3 +96,15 @@
23
96
96
24
97
    external_ports = API_PORTS.values()
97
    external_ports = API_PORTS.values()
25
98
    service_namespace = 'heat'
98
    service_namespace = 'heat'
26
99
27
100
28
101
class InstanceUserContext(context.OSContextGenerator):
29
102
30
103
    def __call__(self):
31
104
        ctxt = {}
32
105
33
106
        instance_user = ''
34
107
        if config('instance-user'):
35
108
            instance_user = config('instance-user')
36
109
        ctxt['instance_user'] = instance_user
37
110
        return ctxt
38
99
111
39
=== modified file 'hooks/heat_utils.py'
40
--- hooks/heat_utils.py	2015-11-16 09:14:33 +0000
41
+++ hooks/heat_utils.py	2016-01-05 15:04:28 +0000
42
@@ -38,6 +38,7 @@
43
38
    API_PORTS,
38
    API_PORTS,
44
39
    HeatIdentityServiceContext,
39
    HeatIdentityServiceContext,
45
40
    EncryptionContext,
40
    EncryptionContext,
46
41
    InstanceUserContext,
47
41
    HeatApacheSSLContext,
42
    HeatApacheSSLContext,
48
42
    HeatHAProxyContext,
43
    HeatHAProxyContext,
49
43
)
44
)
50
@@ -86,6 +87,7 @@
51
86
                     HeatIdentityServiceContext(service=SVC, service_user=SVC),
87
                     HeatIdentityServiceContext(service=SVC, service_user=SVC),
52
87
                     HeatHAProxyContext(),
88
                     HeatHAProxyContext(),
53
88
                     EncryptionContext(),
89
                     EncryptionContext(),
54
90
                     InstanceUserContext(),
55
89
                     context.SyslogContext(),
91
                     context.SyslogContext(),
56
90
                     context.LogLevelContext(),
92
                     context.LogLevelContext(),
57
91
                     context.BindHostContext()]
93
                     context.BindHostContext()]
58
92
94
59
=== added directory 'templates/icehouse'
60
=== added file 'templates/icehouse/heat.conf'
61
--- templates/icehouse/heat.conf	1970-01-01 00:00:00 +0000
62
+++ templates/icehouse/heat.conf	2016-01-05 15:04:28 +0000
63
@@ -0,0 +1,79 @@
64
1
[DEFAULT]
65
2
use_syslog = {{ use_syslog }}
66
3
verbose = {{ verbose }}
67
4
debug = {{ debug }}
68
5
log_dir = /var/log/heat
69
6
# Icehouse expects 'instance_user=' to allow the image's default user
70
7
# Not including instance_user at all results in 'ec2-user' being used
71
8
instance_user={{ instance_user }}
72
9
instance_driver=heat.engine.nova
73
10
plugin_dirs=/usr/lib64/heat,/usr/lib/heat
74
11
environment_dir=/etc/heat/environment.d
75
12
deferred_auth_method=password
76
13
host=heat
77
14
auth_encryption_key={{ encryption_key }}
78
15
79
16
{% if database_host -%}
80
17
# < Icehouse db config
81
18
sql_connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
82
19
{% endif %}
83
20
84
21
{% if rabbitmq_host or rabbitmq_hosts -%}
85
22
rabbit_userid = {{ rabbitmq_user }}
86
23
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
87
24
rabbit_password = {{ rabbitmq_password }}
88
25
{% if rabbitmq_hosts -%}
89
26
rabbit_hosts = {{ rabbitmq_hosts }}
90
27
{% if rabbitmq_ha_queues -%}
91
28
rabbit_ha_queues = True
92
29
rabbit_durable_queues = False
93
30
{% endif -%}
94
31
{% else -%}
95
32
rabbit_host = {{ rabbitmq_host }}
96
33
{% endif -%}
97
34
{% if rabbit_ssl_port -%}
98
35
rabbit_use_ssl = True
99
36
rabbit_port = {{ rabbit_ssl_port }}
100
37
{% if rabbit_ssl_ca -%}
101
38
kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
102
39
{% endif -%}
103
40
{% endif -%}
104
41
{% endif %}
105
42
106
43
{% if auth_host -%}
107
44
[keystone_authtoken]
108
45
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
109
46
auth_host = {{ auth_host }}
110
47
auth_port = {{ auth_port }}
111
48
auth_protocol = {{ auth_protocol }}
112
49
admin_tenant_name = {{ admin_tenant_name }}
113
50
admin_user = {{ admin_user }}
114
51
admin_password = {{ admin_password }}
115
52
signing_dir = {{ signing_dir }}
116
53
{% endif %}
117
54
118
55
[ec2_authtoken]
119
56
auth_uri = {{service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
120
57
keystone_ec2_uri = {{service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0/ec2tokens
121
58
122
59
{% if database_host -%}
123
60
[database]
124
61
connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
125
62
{% endif -%}
126
63
127
64
[paste_deploy]
128
65
api_paste_config=/etc/heat/api-paste.ini
129
66
130
67
[heat_api]
131
68
{% if api_listen_port -%} 
132
69
bind_port={{ api_listen_port }}
133
70
{% else -%}
134
71
bind_port=8004
135
72
{% endif %}
136
73
137
74
[heat_api_cfn]
138
75
{% if api_cfn_listen_port -%}
139
76
bind_port={{ api_cfn_listen_port }}
140
77
{% else -%}
141
78
bind_port=8000
142
79
{% endif %}
143
0
80
144
=== modified file 'templates/kilo/heat.conf'
145
--- templates/kilo/heat.conf	2015-10-30 10:53:01 +0000
146
+++ templates/kilo/heat.conf	2016-01-05 15:04:28 +0000
147
@@ -3,7 +3,7 @@
148
3
debug = False
3
debug = False
149
4
verbose = False
4
verbose = False
150
5
log_dir = /var/log/heat
5
log_dir = /var/log/heat
152
6
instance_user=ec2-user
6
instance_user={{ instance_user }}
153
7
instance_driver=heat.engine.nova
7
instance_driver=heat.engine.nova
154
8
plugin_dirs=/usr/lib64/heat,/usr/lib/heat
8
plugin_dirs=/usr/lib64/heat,/usr/lib/heat
155
9
environment_dir=/etc/heat/environment.d
9
environment_dir=/etc/heat/environment.d
156
10
10
157
=== modified file 'unit_tests/test_heat_context.py'
158
--- unit_tests/test_heat_context.py	2014-04-16 08:19:26 +0000
159
+++ unit_tests/test_heat_context.py	2016-01-05 15:04:28 +0000
160
@@ -4,7 +4,8 @@
161
4
4
162
5
TO_PATCH = [
5
TO_PATCH = [
163
6
    'get_encryption_key',
6
    'get_encryption_key',
165
7
    'generate_ec2_tokens'
7
    'generate_ec2_tokens',
166
8
    'config'
167
8
]
9
]
168
9
10
169
10
11
170
@@ -19,6 +20,12 @@
171
19
            heat_context.EncryptionContext()(),
20
            heat_context.EncryptionContext()(),
172
20
            {'encryption_key': 'key'})
21
            {'encryption_key': 'key'})
173
21
22
174
23
    def test_instance_user_empty_configuration(self):
175
24
        self.config.return_value = None
176
25
        self.assertEquals(
177
26
            heat_context.InstanceUserContext()(),
178
27
            {'instance_user': ''})
179
28
180
22
    @patch('charmhelpers.contrib.openstack.'
29
    @patch('charmhelpers.contrib.openstack.'
181
23
           'context.IdentityServiceContext.__call__')
30
           'context.IdentityServiceContext.__call__')
182
24
    def test_identity_configuration(self, __call__):
31
    def test_identity_configuration(self, __call__):
Reviewer	Date Requested	Status
Liam Young (community)	2015-11-03	Approve on 2016-01-06
Ryan Beisner	2015-11-03	Pending
Review via email: mp+276499@code.launchpad.net