Merge "Fix Venus containers start issue"

ansible/roles/venus/templates/venus-api.json.j2

@@ -1,19 +1,19 @@
-{
-    "command": "venus-api --config-file /etc/venus/venus.conf",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/venus.conf",
-            "dest": "/etc/venus/venus.conf",
-            "owner": "venus",
-            "perm": "0644"
-        }
-    ],
-   "permissions": [
-        {
-            "path":"/var/log/kolla/venus/venus-api.log",
-            "owner": "venus:venus",
-            "recurse": true
-        }
-    ]
-}
-
+{
+    "command": "venus_api --config-file /etc/venus/venus.conf",
+    "config_files": [
+        {
+            "source": "{{ container_config_directory }}/venus.conf",
+            "dest": "/etc/venus/venus.conf",
+            "owner": "venus",
+            "perm": "0644"
+        }
+    ],
+   "permissions": [
+        {
+            "path":"/var/log/kolla/venus/venus-api.log",
+            "owner": "venus:venus",
+            "recurse": true
+        }
+    ]
+}
+

ansible/roles/venus/templates/venus-manager.json.j2

@@ -1,19 +1,19 @@
-{
-    "command": "venus-manager --config-file /etc/venus/venus.conf task start",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/venus.conf",
-            "dest": "/etc/venus/venus.conf",
-            "owner": "venus",
-            "perm": "0644"
-        }
-    ],
-   "permissions": [
-        {
-            "path":"/var/log/kolla/venus/venus-manager.log",
-            "owner": "venus:venus",
-            "recurse": true
-        }
-    ]
-}
-
+{
+    "command": "venus_manager --config-file /etc/venus/venus.conf task start",
+    "config_files": [
+        {
+            "source": "{{ container_config_directory }}/venus.conf",
+            "dest": "/etc/venus/venus.conf",
+            "owner": "venus",
+            "perm": "0644"
+        }
+    ],
+   "permissions": [
+        {
+            "path":"/var/log/kolla/venus/venus-manager.log",
+            "owner": "venus:venus",
+            "recurse": true
+        }
+    ]
+}
+

ansible/roles/venus/templates/venus.conf.j2

@@ -1,35 +1,35 @@
-[DEFAULT]
-my_ip = {{ api_interface_address }}
-periodic_interval = 60
-rootwrap_config = /etc/venus/rootwrap.conf
-api_paste_config = /etc/venus/api-paste.ini
-log_dir = /var/log/kolla/venus/
-debug = {{ venus_logging_debug }}
-auth_strategy = keystone
-os_region_name = {{ openstack_region_name }}
-osapi_venus_listen = {{ api_interface_address }}
-osapi_venus_listen_port = {{ venus_api_port }}
-
-logging_default_format_string = {{ openstack_logging_default_format_string }}
-logging_context_format_string = {{ openstack_logging_context_format_string }}
-
-transport_url = {{ rpc_transport_url }}
-
-[database]
-connection = mysql+pymysql://{{ venus_database_user }}:{{ venus_database_password }}@{{ venus_database_address }}/{{ venus_database_name }}?charset=utf8
-
-[keystone_authtoken]
-cafile = {{ openstack_cacert }}
-project_name = service
-password = {{ venus_keystone_password }}
-username = {{ venus_keystone_user }}
-auth_url = {{ keystone_internal_url }}
-project_domain_id = {{ default_project_domain_id }}
-user_domain_id = {{ default_user_domain_id }}
-auth_type = password
-memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-
-{% if enable_opensearch | bool %}
-[elasticsearch]
-url = {{ opensearch_internal_endpoint }}
-{% endif %}
+[DEFAULT]
+my_ip = {{ api_interface_address }}
+periodic_interval = 60
+rootwrap_config = /etc/venus/rootwrap.conf
+api_paste_config = /etc/venus/api-paste.ini
+log_dir = /var/log/kolla/venus/
+debug = {{ venus_logging_debug }}
+auth_strategy = keystone
+os_region_name = {{ openstack_region_name }}
+osapi_venus_listen = {{ api_interface_address }}
+osapi_venus_listen_port = {{ venus_api_port }}
+
+logging_default_format_string = {{ openstack_logging_default_format_string }}
+logging_context_format_string = {{ openstack_logging_context_format_string }}
+
+transport_url = {{ rpc_transport_url }}
+
+[database]
+connection = mysql+pymysql://{{ venus_database_user }}:{{ venus_database_password }}@{{ venus_database_address }}/{{ venus_database_name }}?charset=utf8
+
+[keystone_authtoken]
+cafile = {{ openstack_cacert }}
+project_name = service
+password = {{ venus_keystone_password }}
+username = {{ venus_keystone_user }}
+auth_url = {{ keystone_internal_url }}
+project_domain_id = {{ default_project_domain_id }}
+user_domain_id = {{ default_user_domain_id }}
+auth_type = password
+memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
+
+{% if enable_opensearch | bool %}
+[elasticsearch]
+url = {{ opensearch_internal_endpoint }}
+{% endif %}