Bring consistency to tags
Some tags were not applied on the highest level and forced duplication. We apply here our practices to have role_name-(config|install) [1]. [1]: http://docs.openstack.org/developer/openstack-ansible/developer-docs/contribute.html#ansible-style-guide Change-Id: Ib44b2aa978df1c763d8c619a37d1025c3a90e6c1
This commit is contained in:
parent
aae3f2ba69
commit
c49a94dead
@ -25,7 +25,13 @@
|
|||||||
- always
|
- always
|
||||||
|
|
||||||
- include: repo_pre_install.yml
|
- include: repo_pre_install.yml
|
||||||
|
tags:
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- include: repo_install.yml
|
- include: repo_install.yml
|
||||||
|
tags:
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- include: repo_post_install.yml
|
- include: repo_post_install.yml
|
||||||
|
|
||||||
- include: repo_cacher.yml
|
- include: repo_cacher.yml
|
||||||
@ -33,12 +39,18 @@
|
|||||||
when: repo_pkg_cache_enabled | bool
|
when: repo_pkg_cache_enabled | bool
|
||||||
|
|
||||||
- include: repo_key_populate.yml
|
- include: repo_key_populate.yml
|
||||||
|
tags:
|
||||||
|
- repo_server-config
|
||||||
|
|
||||||
- include: repo_key_distribute.yml
|
- include: repo_key_distribute.yml
|
||||||
when: groups.repo_all|length > 1
|
when: groups.repo_all|length > 1
|
||||||
|
tags:
|
||||||
|
- repo_server-config
|
||||||
|
|
||||||
- include: repo_sync_manager.yml
|
- include: repo_sync_manager.yml
|
||||||
when: inventory_hostname == groups['repo_all'][0]
|
when: inventory_hostname == groups['repo_all'][0]
|
||||||
|
tags:
|
||||||
|
- repo_server-config
|
||||||
|
|
||||||
- name: Flush handlers
|
- name: Flush handlers
|
||||||
meta: flush_handlers
|
meta: flush_handlers
|
||||||
|
@ -26,6 +26,8 @@
|
|||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'yum'
|
- ansible_pkg_mgr == 'yum'
|
||||||
- repo_pkg_cache_enabled | bool
|
- repo_pkg_cache_enabled | bool
|
||||||
|
tags:
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Install repo caching server packages (apt)
|
- name: Install repo caching server packages (apt)
|
||||||
apt:
|
apt:
|
||||||
@ -39,6 +41,8 @@
|
|||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
- repo_pkg_cache_enabled | bool
|
- repo_pkg_cache_enabled | bool
|
||||||
|
tags:
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Create cache directory
|
- name: Create cache directory
|
||||||
file:
|
file:
|
||||||
@ -47,11 +51,15 @@
|
|||||||
owner: "{{ repo_pkg_cache_owner }}"
|
owner: "{{ repo_pkg_cache_owner }}"
|
||||||
group: "{{ repo_service_group_name }}"
|
group: "{{ repo_service_group_name }}"
|
||||||
mode: "02775"
|
mode: "02775"
|
||||||
|
tags:
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Stat the cache path
|
- name: Stat the cache path
|
||||||
stat:
|
stat:
|
||||||
path: /var/cache/apt-cacher-ng
|
path: /var/cache/apt-cacher-ng
|
||||||
register: acs
|
register: acs
|
||||||
|
tags:
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Remove cacher directory if its a directory
|
- name: Remove cacher directory if its a directory
|
||||||
file:
|
file:
|
||||||
@ -59,12 +67,16 @@
|
|||||||
state: "absent"
|
state: "absent"
|
||||||
when:
|
when:
|
||||||
- acs.stat.isdir is defined and acs.stat.isdir
|
- acs.stat.isdir is defined and acs.stat.isdir
|
||||||
|
tags:
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Link cacher to the repo path
|
- name: Link cacher to the repo path
|
||||||
file:
|
file:
|
||||||
src: "{{ repo_service_home_folder }}/repo/pkg-cache"
|
src: "{{ repo_service_home_folder }}/repo/pkg-cache"
|
||||||
dest: "/var/cache/apt-cacher-ng"
|
dest: "/var/cache/apt-cacher-ng"
|
||||||
state: "link"
|
state: "link"
|
||||||
|
tags:
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Drop acng.conf
|
- name: Drop acng.conf
|
||||||
template:
|
template:
|
||||||
@ -72,3 +84,5 @@
|
|||||||
dest: "/etc/apt-cacher-ng/acng.conf"
|
dest: "/etc/apt-cacher-ng/acng.conf"
|
||||||
notify:
|
notify:
|
||||||
- reload acng
|
- reload acng
|
||||||
|
tags:
|
||||||
|
- repo_server-config
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
system: "yes"
|
system: "yes"
|
||||||
tags:
|
tags:
|
||||||
- pkg-repo-group
|
- pkg-repo-group
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Remove old key file(s) if found
|
- name: Remove old key file(s) if found
|
||||||
file:
|
file:
|
||||||
@ -33,6 +34,7 @@
|
|||||||
tags:
|
tags:
|
||||||
- repo-key
|
- repo-key
|
||||||
- repo-key-create
|
- repo-key-create
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Create the nginx system user
|
- name: Create the nginx system user
|
||||||
user:
|
user:
|
||||||
@ -48,6 +50,7 @@
|
|||||||
- pkg-repo-user
|
- pkg-repo-user
|
||||||
- repo-key
|
- repo-key
|
||||||
- repo-key-create
|
- repo-key-create
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: File and directory setup (non-root user)
|
- name: File and directory setup (non-root user)
|
||||||
file:
|
file:
|
||||||
@ -77,6 +80,7 @@
|
|||||||
mode: "0775"
|
mode: "0775"
|
||||||
tags:
|
tags:
|
||||||
- pkg-repo-dirs
|
- pkg-repo-dirs
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Drop repo pre/post command script
|
- name: Drop repo pre/post command script
|
||||||
template:
|
template:
|
||||||
@ -87,6 +91,7 @@
|
|||||||
group: "root"
|
group: "root"
|
||||||
tags:
|
tags:
|
||||||
- pkg-repo-config
|
- pkg-repo-config
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Check if the git folder exists already
|
- name: Check if the git folder exists already
|
||||||
stat:
|
stat:
|
||||||
@ -94,6 +99,7 @@
|
|||||||
register: _git_folder
|
register: _git_folder
|
||||||
tags:
|
tags:
|
||||||
- pkg-repo-dirs
|
- pkg-repo-dirs
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Git service data folder setup
|
- name: Git service data folder setup
|
||||||
file:
|
file:
|
||||||
@ -104,6 +110,7 @@
|
|||||||
recurse: true
|
recurse: true
|
||||||
tags:
|
tags:
|
||||||
- pkg-repo-dirs
|
- pkg-repo-dirs
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: File and directory setup (root user)
|
- name: File and directory setup (root user)
|
||||||
file:
|
file:
|
||||||
@ -127,6 +134,8 @@
|
|||||||
- path: "/etc/nginx/sites-enabled"
|
- path: "/etc/nginx/sites-enabled"
|
||||||
state: "directory"
|
state: "directory"
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
tags:
|
||||||
|
- repo_server-install
|
||||||
|
|
||||||
- name: Drop NGINX configuration files
|
- name: Drop NGINX configuration files
|
||||||
template:
|
template:
|
||||||
@ -141,6 +150,7 @@
|
|||||||
tags:
|
tags:
|
||||||
- pkg-repo-nginx
|
- pkg-repo-nginx
|
||||||
- pkg-repo-config
|
- pkg-repo-config
|
||||||
|
- repo_server-config
|
||||||
|
|
||||||
- name: Enable openstack-slushee site
|
- name: Enable openstack-slushee site
|
||||||
file:
|
file:
|
||||||
@ -152,6 +162,7 @@
|
|||||||
tags:
|
tags:
|
||||||
- pkg-repo-nginx
|
- pkg-repo-nginx
|
||||||
- pkg-repo-config
|
- pkg-repo-config
|
||||||
|
- repo_server-config
|
||||||
|
|
||||||
- name: Place git daemon systemd init script
|
- name: Place git daemon systemd init script
|
||||||
template:
|
template:
|
||||||
@ -169,3 +180,4 @@
|
|||||||
- reload git socket
|
- reload git socket
|
||||||
tags:
|
tags:
|
||||||
- git-daemon-init
|
- git-daemon-init
|
||||||
|
- repo_server-config
|
||||||
|
Loading…
Reference in New Issue
Block a user