equal
deleted
inserted
replaced
1 <?xml version="1.0" ?> |
1 <?xml version="1.0" ?> |
2 <!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'> |
2 <!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'> |
3 <!-- |
3 <!-- |
4 Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. |
4 Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. |
5 |
5 |
6 Licensed under the Apache License, Version 2.0 (the "License"); you may |
6 Licensed under the Apache License, Version 2.0 (the "License"); you may |
7 not use this file except in compliance with the License. You may obtain |
7 not use this file except in compliance with the License. You may obtain |
8 a copy of the License at |
8 a copy of the License at |
9 |
9 |
57 </dependency> |
57 </dependency> |
58 |
58 |
59 <logfile_attributes permissions='600'/> |
59 <logfile_attributes permissions='600'/> |
60 |
60 |
61 <exec_method timeout_seconds="60" type="method" name="start" |
61 <exec_method timeout_seconds="60" type="method" name="start" |
62 exec="/lib/svc/method/neutron-l3-agent %m %{config/config_path} %{config/l3_config_path}"> |
62 exec="/lib/svc/method/neutron-l3-agent %m %{config/config_path} %{config/l3_config_path} %{config/vpn_config_path}"> |
63 <method_context> |
63 <method_context> |
64 <!-- sys_ip_config is required to set 'hostmodel' ipadm property --> |
64 <!-- sys_ip_config is required to set 'hostmodel' ipadm property --> |
65 <method_credential user='neutron' group='neutron' privileges='basic,sys_ip_config' /> |
65 <method_credential user='neutron' group='neutron' privileges='basic,sys_ip_config' /> |
66 </method_context> |
66 </method_context> |
67 </exec_method> |
67 </exec_method> |
85 <property_group name='config' type='application'> |
85 <property_group name='config' type='application'> |
86 <propval name='config_path' type='astring' |
86 <propval name='config_path' type='astring' |
87 value='/etc/neutron/neutron.conf'/> |
87 value='/etc/neutron/neutron.conf'/> |
88 <propval name='l3_config_path' type='astring' |
88 <propval name='l3_config_path' type='astring' |
89 value='/etc/neutron/l3_agent.ini'/> |
89 value='/etc/neutron/l3_agent.ini'/> |
|
90 <propval name='vpn_config_path' type='astring' |
|
91 value='/etc/neutron/vpn_agent.ini'/> |
90 </property_group> |
92 </property_group> |
91 </instance> |
93 </instance> |
92 |
94 |
93 <template> |
95 <template> |
94 <common_name> |
96 <common_name> |
118 <loctext xml:lang='C'> |
120 <loctext xml:lang='C'> |
119 Filesystem path to Neutron L3 .ini file |
121 Filesystem path to Neutron L3 .ini file |
120 </loctext> |
122 </loctext> |
121 </common_name> |
123 </common_name> |
122 </prop_pattern> |
124 </prop_pattern> |
|
125 <prop_pattern name='vpn_config_path' type='astring' |
|
126 required='true'> |
|
127 <common_name> |
|
128 <loctext xml:lang='C'> |
|
129 Filesystem path to Neutron VPNaaS .ini file |
|
130 </loctext> |
|
131 </common_name> |
|
132 </prop_pattern> |
123 </pg_pattern> |
133 </pg_pattern> |
124 </template> |
134 </template> |
125 </service> |
135 </service> |
126 </service_bundle> |
136 </service_bundle> |