Remove Trusty Support from repo_server role

Change-Id: Ib5e24fcc7509a312ca8ee6c5811c3f194f16d662
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 15:32:08 +00:00
parent 55eb0f8830
commit 997047b558
6 changed files with 2 additions and 36 deletions

View File

@ -32,7 +32,7 @@ libselinux-python [platform:rpm]
# For SSL SNI support
python-pyasn1 [platform:dpkg]
python-openssl [platform:dpkg]
python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-trusty]
python-ndg-httpsclient [platform:ubuntu]
python2-pyasn1 [platform:rpm]
pyOpenSSL [platform:rpm]
python-ndg_httpsclient [platform:rpm]

View File

@ -21,41 +21,35 @@
name: "nginx"
state: restarted
enabled: yes
pattern: "nginx"
- name: reload rsyncd
service:
name: "{{ rsyncd_service_name }}"
state: restarted
enabled: yes
pattern: "rsync"
- name: reload acng
service:
name: "apt-cacher-ng"
state: restarted
enabled: yes
pattern: "apt-cacher-ng"
- name: reload ssh
service:
name: "ssh"
state: restarted
pattern: "ssh"
- name: reload lsyncd
service:
name: "lsyncd"
state: restarted
enabled: yes
pattern: "lsyncd"
- name: reload git-daemon
service:
name: "git-daemon"
state: restarted
enabled: yes
pattern: "git daemon"
- name: reload git socket
service:

View File

@ -22,7 +22,6 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- trusty
- xenial
- name: EL
versions:

View File

@ -143,23 +143,7 @@
- pkg-repo-nginx
- pkg-repo-config
- name: Place git daemon upstart init script
template:
src: "git-daemon-upstart-init.j2"
dest: "/etc/init/git-daemon.conf"
mode: "0644"
owner: "root"
group: "root"
when:
- ansible_service_mgr == 'upstart'
- ansible_distribution == "Ubuntu"
notify:
- Init reload
- reload git-daemon
tags:
- git-daemon-init
- name: Place git daemon upstart init script
- name: Place git daemon systemd init script
template:
src: "{{ item.src }}"
dest: "{{ item.dest }}"

View File

@ -21,6 +21,4 @@ PassThroughPattern: .*
{% if proxy_env_url is defined %}
Proxy: {{ proxy_env_url }}
{% endif %}
{% if ansible_distribution_release != "trusty" %}
VfilePatternEx: ^/\?release=[0-9]+&arch=
{% endif %}

View File

@ -1,9 +0,0 @@
start on startup
stop on shutdown
exec /usr/bin/git daemon \
--user=nobody \
--export-all \
--reuseaddr \
--base-path={{ repo_service_home_folder }}/repo/openstackgit/ \
{{ repo_service_home_folder }}/repo/openstackgit/
respawn