3 files changed, 0 insertions, 108 deletions
diff --git a/ansible/roles/magnum/templates/magnum-api.json.j2 b/ansible/roles/magnum/templates/magnum-api.json.j2
deleted file mode 100644
index b79de7005..000000000
--- a/ansible/roles/magnum/templates/magnum-api.json.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "command": "magnum-api --config-file /etc/magnum/magnum.conf",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/magnum.conf",
-            "dest": "/etc/magnum/magnum.conf",
-            "owner": "magnum",
-            "perm": "0600"
-        }
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/kolla/magnum",
-            "owner": "magnum:magnum",
-            "recurse": true
-        }
-    ]
-}
diff --git a/ansible/roles/magnum/templates/magnum-conductor.json.j2 b/ansible/roles/magnum/templates/magnum-conductor.json.j2
deleted file mode 100644
index 40a6fa265..000000000
--- a/ansible/roles/magnum/templates/magnum-conductor.json.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "command": "magnum-conductor --config-file /etc/magnum/magnum.conf",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/magnum.conf",
-            "dest": "/etc/magnum/magnum.conf",
-            "owner": "magnum",
-            "perm": "0600"
-        }
-    ],
-    "permissions": [
-        {
-            "path": "/var/lib/magnum",
-            "owner": "magnum:magnum",
-            "recurse": true
-        },
-        {
-            "path": "/var/log/kolla/magnum",
-            "owner": "magnum:magnum",
-            "recurse": true
-        }
-    ]
-}
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
deleted file mode 100644
index e567d3239..000000000
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ /dev/null
@@ -1,67 +0,0 @@
-[DEFAULT]
-debug = {{ magnum_logging_debug }}
-state_path = /var/lib/magnum
-log_dir = /var/log/kolla/magnum
-
-transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
-
-{% if service_name == 'magnum-api' %}
-[api]
-port = {{ magnum_api_port }}
-host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
-{% endif %}
-
-[oslo_policy]
-policy_file = /etc/magnum/policy.json
-
-[database]
-connection = mysql+pymysql://{{ magnum_database_user }}:{{ magnum_database_password }}@{{ magnum_database_address}}/{{ magnum_database_name }}
-max_retries = -1
-
-[heat_client]
-region_name = {{ openstack_region_name }}
-
-[cinder_client]
-region_name = {{ openstack_region_name }}
-
-[barbican_client]
-region_name = {{ openstack_region_name }}
-
-[keystone_auth]
-auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
-user_domain_name = Default
-project_domain_name = Default
-project_name = service
-password = {{ magnum_keystone_password }}
-username = {{ magnum_keystone_user }}
-auth_type = password
-
-[keystone_authtoken]
-auth_version = v3
-auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
-auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
-auth_type = password
-project_domain_name = Default
-user_domain_name = Default
-project_name = service
-username = {{ magnum_keystone_user }}
-password = {{ magnum_keystone_password }}
-
-memcache_security_strategy = ENCRYPT
-memcache_secret_key = {{ memcache_secret_key }}
-memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-
-[trust]
-trustee_domain_admin_password = {{ magnum_keystone_password }}
-trustee_domain_admin_name = {{ magnum_trustee_domain_admin }}
-trustee_domain_name = {{ magnum_trustee_domain }}
-
-[oslo_concurrency]
-lock_path = /var/lib/magnum/tmp
-
-[certificates]
-{% if enable_barbican | bool %}
-cert_manager_type = barbican
-{% else %}
-cert_manager_type = x509keypair
-{% endif %}