13 files changed, 0 insertions, 313 deletions
diff --git a/ansible/roles/keystone/templates/crontab.j2 b/ansible/roles/keystone/templates/crontab.j2
deleted file mode 100644
index af16e114f..000000000
--- a/ansible/roles/keystone/templates/crontab.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for cron_job in cron_jobs %}
-{{ cron_job['min'] }} {{ cron_job['hour'] }} * * {{ cron_job['day'] }} /usr/bin/fernet-rotate.sh
-{% endfor %}
diff --git a/ansible/roles/keystone/templates/fernet-node-sync.sh.j2 b/ansible/roles/keystone/templates/fernet-node-sync.sh.j2
deleted file mode 100644
index a100f2377..000000000
--- a/ansible/roles/keystone/templates/fernet-node-sync.sh.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Get data on the fernet tokens
-TOKEN_CHECK=$(/usr/bin/fetch_fernet_tokens.py -t {{ fernet_token_expiry }} -n {{ (groups['keystone'] | length) + 1 }})
-
-# Ensure the primary token exists and is not stale
-if $(echo "$TOKEN_CHECK" | grep -q '"update_required":"false"'); then
-    exit 0;
-fi
-
-# For each host node sync tokens
-{% for host in groups['keystone'] %}
-{% if inventory_hostname != host %}
-/usr/bin/rsync -azu --delete -e 'ssh -i /var/lib/keystone/.ssh/id_rsa -p {{ keystone_ssh_port }} -F /var/lib/keystone/.ssh/config' keystone@{{ host }}:/etc/keystone/fernet-keys/ /etc/keystone/fernet-keys
-{% endif %}
-{% endfor %}
diff --git a/ansible/roles/keystone/templates/fernet-rotate.sh.j2 b/ansible/roles/keystone/templates/fernet-rotate.sh.j2
deleted file mode 100644
index 28c5b6f67..000000000
--- a/ansible/roles/keystone/templates/fernet-rotate.sh.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-keystone-manage --config-file /etc/keystone/keystone.conf fernet_rotate --keystone-user {{ keystone_username }} --keystone-group {{ keystone_groupname }}
-
-{% for host in groups['keystone'] %}
-{% if inventory_hostname != host %}
-/usr/bin/rsync -az -e 'ssh -i /var/lib/keystone/.ssh/id_rsa -p {{ keystone_ssh_port }} -F /var/lib/keystone/.ssh/config' --delete /etc/keystone/fernet-keys/ keystone@{{ host }}:/etc/keystone/fernet-keys
-{% endif %}
-{% endfor %}
diff --git a/ansible/roles/keystone/templates/id_rsa b/ansible/roles/keystone/templates/id_rsa
deleted file mode 100644
index 3e2716616..000000000
--- a/ansible/roles/keystone/templates/id_rsa
+++ /dev/null
@@ -1 +0,0 @@
-{{ keystone_ssh_key.private_key }}
diff --git a/ansible/roles/keystone/templates/id_rsa.pub b/ansible/roles/keystone/templates/id_rsa.pub
deleted file mode 100644
index 529f98ab8..000000000
--- a/ansible/roles/keystone/templates/id_rsa.pub
+++ /dev/null
@@ -1 +0,0 @@
-{{ keystone_ssh_key.public_key }}
diff --git a/ansible/roles/keystone/templates/keystone-fernet.json.j2 b/ansible/roles/keystone/templates/keystone-fernet.json.j2
deleted file mode 100644
index 9078977b5..000000000
--- a/ansible/roles/keystone/templates/keystone-fernet.json.j2
+++ /dev/null
@@ -1,41 +0,0 @@
-{% set cron_cmd = 'cron -f' if kolla_base_distro in ['ubuntu', 'debian'] else 'crond -s -n' %}
-{
-    "command": "{{ cron_cmd }}",
-    "config_files": [{
-            "source": "{{ container_config_directory }}/keystone.conf",
-            "dest": "/etc/keystone/keystone.conf",
-            "owner": "keystone",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/crontab",
-            "dest": "/var/spool/cron/crontabs/root/fernet-cron",
-            "owner": "root",
-            "perm": "0644"
-        },
-        {
-            "source": "{{ container_config_directory }}/fernet-rotate.sh",
-            "dest": "/usr/bin/fernet-rotate.sh",
-            "owner": "root",
-            "perm": "0755"
-        },
-        {
-            "source": "{{ container_config_directory }}/fernet-node-sync.sh",
-            "dest": "/usr/bin/fernet-node-sync.sh",
-            "owner": "root",
-            "perm": "0755"
-        },
-        {
-            "source": "{{ container_config_directory }}/ssh_config",
-            "dest": "/var/lib/keystone/.ssh/config",
-            "owner": "keystone",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/id_rsa",
-            "dest": "/var/lib/keystone/.ssh/id_rsa",
-            "owner": "keystone",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/keystone/templates/keystone-paste.ini.j2 b/ansible/roles/keystone/templates/keystone-paste.ini.j2
deleted file mode 100644
index 0e2ee368e..000000000
--- a/ansible/roles/keystone/templates/keystone-paste.ini.j2
+++ /dev/null
@@ -1,83 +0,0 @@
-# Keystone PasteDeploy configuration file.
-
-[filter:debug]
-use = egg:oslo.middleware#debug
-
-[filter:request_id]
-use = egg:oslo.middleware#request_id
-
-[filter:build_auth_context]
-use = egg:keystone#build_auth_context
-
-[filter:token_auth]
-use = egg:keystone#token_auth
-
-[filter:json_body]
-use = egg:keystone#json_body
-
-[filter:cors]
-use = egg:oslo.middleware#cors
-oslo_config_project = keystone
-
-[filter:ec2_extension]
-use = egg:keystone#ec2_extension
-
-[filter:ec2_extension_v3]
-use = egg:keystone#ec2_extension_v3
-
-[filter:s3_extension]
-use = egg:keystone#s3_extension
-
-[filter:url_normalize]
-use = egg:keystone#url_normalize
-
-[filter:sizelimit]
-use = egg:oslo.middleware#sizelimit
-
-[app:public_service]
-use = egg:keystone#public_service
-
-[app:service_v3]
-use = egg:keystone#service_v3
-
-[app:admin_service]
-use = egg:keystone#admin_service
-
-[pipeline:public_api]
-# The last item in this pipeline must be public_service or an equivalent
-# application. It cannot be a filter.
-pipeline = cors sizelimit url_normalize request_id build_auth_context token_auth json_body ec2_extension public_service
-
-[pipeline:admin_api]
-# The last item in this pipeline must be admin_service or an equivalent
-# application. It cannot be a filter.
-pipeline = cors sizelimit url_normalize request_id build_auth_context token_auth json_body ec2_extension s3_extension admin_service
-
-[pipeline:api_v3]
-# The last item in this pipeline must be service_v3 or an equivalent
-# application. It cannot be a filter.
-pipeline = cors sizelimit url_normalize request_id build_auth_context token_auth json_body ec2_extension_v3 s3_extension service_v3
-
-[app:public_version_service]
-use = egg:keystone#public_version_service
-
-[app:admin_version_service]
-use = egg:keystone#admin_version_service
-
-[pipeline:public_version_api]
-pipeline = cors sizelimit url_normalize public_version_service
-
-[pipeline:admin_version_api]
-pipeline = cors sizelimit url_normalize admin_version_service
-
-[composite:main]
-use = egg:Paste#urlmap
-/v2.0 = public_api
-/v3 = api_v3
-/ = public_version_api
-
-[composite:admin]
-use = egg:Paste#urlmap
-/v2.0 = admin_api
-/v3 = api_v3
-/ = admin_version_api
diff --git a/ansible/roles/keystone/templates/keystone-ssh.json.j2 b/ansible/roles/keystone/templates/keystone-ssh.json.j2
deleted file mode 100644
index c13e0eda6..000000000
--- a/ansible/roles/keystone/templates/keystone-ssh.json.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "command": "/usr/sbin/sshd -D",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/sshd_config",
-            "dest": "/etc/ssh/sshd_config",
-            "owner": "root",
-            "perm": "0644"
-        },
-        {
-            "source": "{{ container_config_directory }}/id_rsa.pub",
-            "dest": "/var/lib/keystone/.ssh/authorized_keys",
-            "owner": "keystone",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2
deleted file mode 100644
index ff33a241f..000000000
--- a/ansible/roles/keystone/templates/keystone.conf.j2
+++ /dev/null
@@ -1,52 +0,0 @@
-[DEFAULT]
-debug = {{ keystone_logging_debug }}
-{% if enable_cadf_notifications | bool %}
-notification_format = cadf
-transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{% if orchestration_engine == 'KUBERNETES' %}rabbitmq{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
-{% endif %}
-
-# NOTE(elemoine) log_dir alone does not work for Keystone
-log_file = /var/log/kolla/keystone/keystone.log
-
-secure_proxy_ssl_header = HTTP_X_FORWARDED_PROTO
-
-[database]
-connection = mysql+pymysql://{{ keystone_database_user }}:{{ keystone_database_password }}@{{ keystone_database_address }}/{{ keystone_database_name }}
-max_retries = -1
-
-{% if keystone_domain_cfg.stat.exists %}
-[identity]
-domain_specific_drivers_enabled = true
-domain_config_dir = /etc/keystone/domains
-{% endif %}
-
-[token]
-{% if keystone_token_provider == 'uuid' %}
-provider = uuid
-{% elif keystone_token_provider == 'fernet' %}
-provider = {{ keystone_token_provider }}
-expiration = {{ fernet_token_expiry }}
-
-[fernet_tokens]
-max_active_keys = {{ (groups['keystone'] | length) + 1 }}
-{% endif %}
-
-[cache]
-backend = oslo_cache.memcache_pool
-enabled = True
-
-{# For Kolla-Ansible, generate the memcache servers based on the list of
-memcached servers in the inventory and memcached_servers should be un-set.
-For Kolla-Kubernetes,  it is necessary to define the memcached_servers
-variable in globals.yml to set it to the Kubernetes service for memcached. #}
-
-{% if orchestration_engine == 'KUBERNETES' %}
-memcache_servers = {{ memcached_servers }}
-{% else %}
-memcache_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-{%- endif %}
-
-{% if enable_cadf_notifications | bool %}
-[oslo_messaging_notifications]
-driver = messagingv2
-{% endif %}
diff --git a/ansible/roles/keystone/templates/keystone.json.j2 b/ansible/roles/keystone/templates/keystone.json.j2
deleted file mode 100644
index 3cd792111..000000000
--- a/ansible/roles/keystone/templates/keystone.json.j2
+++ /dev/null
@@ -1,49 +0,0 @@
-{% set keystone_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
-{% set keystone_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
-{
-    "command": "/usr/sbin/{{ keystone_cmd }}",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/keystone.conf",
-            "dest": "/etc/keystone/keystone.conf",
-            "owner": "keystone",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/keystone-paste.ini",
-            "dest": "/etc/keystone/keystone-paste.ini",
-            "owner": "keystone",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/domains",
-            "dest": "/etc/keystone/domains",
-            "owner": "keystone",
-            "perm": "0700",
-            "optional": true
-        },
-        {
-            "source": "{{ container_config_directory }}/policy.json",
-            "dest": "/etc/keystone/policy.json",
-            "owner": "keystone",
-            "perm": "0600",
-            "optional": true
-        },
-        {
-            "source": "{{ container_config_directory }}/wsgi-keystone.conf",
-            "dest": "/etc/{{ keystone_dir }}/wsgi-keystone.conf",
-            "owner": "keystone",
-            "perm": "0644"
-        }
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/kolla",
-            "owner": "keystone:kolla"
-        },
-        {
-            "path": "/var/log/kolla/keystone/keystone.log",
-            "owner": "keystone:keystone"
-        }
-    ]
-}
diff --git a/ansible/roles/keystone/templates/ssh_config.j2 b/ansible/roles/keystone/templates/ssh_config.j2
deleted file mode 100644
index 4a177f655..000000000
--- a/ansible/roles/keystone/templates/ssh_config.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-Host *
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-  Port {{ keystone_ssh_port }}
diff --git a/ansible/roles/keystone/templates/sshd_config.j2 b/ansible/roles/keystone/templates/sshd_config.j2
deleted file mode 100644
index 8b66f42c7..000000000
--- a/ansible/roles/keystone/templates/sshd_config.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-Port {{ keystone_ssh_port }}
-ListenAddress {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
-
-SyslogFacility AUTHPRIV
-UsePAM yes
diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
deleted file mode 100644
index a3f98173a..000000000
--- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-{% set keystone_log_dir = '/var/log/kolla/keystone' %}
-{% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
-Listen {{ api_interface_address }}:{{ keystone_public_port }}
-Listen {{ api_interface_address }}:{{ keystone_admin_port }}
-
-<VirtualHost *:{{ keystone_public_port }}>
-    WSGIDaemonProcess keystone-public processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ python_path }}
-    WSGIProcessGroup keystone-public
-    WSGIScriptAlias / /var/www/cgi-bin/keystone/main
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-    <IfVersion >= 2.4>
-      ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
-    ErrorLog "{{ keystone_log_dir }}/keystone-apache-public-error.log"
-    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
-    CustomLog "{{ keystone_log_dir }}/keystone-apache-public-access.log" logformat
-</VirtualHost>
-
-<VirtualHost *:{{ keystone_admin_port }}>
-    WSGIDaemonProcess keystone-admin processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ python_path }}
-    WSGIProcessGroup keystone-admin
-    WSGIScriptAlias / /var/www/cgi-bin/keystone/admin
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-    <IfVersion >= 2.4>
-      ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
-    ErrorLog "{{ keystone_log_dir }}/keystone-apache-admin-error.log"
-    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
-    CustomLog "{{ keystone_log_dir }}/keystone-apache-admin-access.log" logformat
-</VirtualHost>