diff options
author | Kelley Spoon <kelley.spoon@linaro.org> | 2018-08-22 11:22:05 -0500 |
---|---|---|
committer | Kelley Spoon <kelley.spoon@linaro.org> | 2018-08-29 12:29:51 +0000 |
commit | e14efe3653a9b4d65ade902795d626b1a9cff686 (patch) | |
tree | 42945ddd6131151363a3cc574c37598e2bfb19ff | |
parent | ccc9cde581858e65d68dd102ce6df3e96e097ce7 (diff) |
Misc: rename roles to fit docker-* standard
Roles that deploy a service inside of a docker
container should be prefixed with "docker-". This
change addresses legacy roles.
Change-Id: I626b72252fd6abc58022d78a924c31f09609eec4
Reviewed-on: https://review.linaro.org/28181
Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
-rw-r--r-- | fossology.yml | 2 | ||||
-rw-r--r-- | jenkins-master.yml | 2 | ||||
-rw-r--r-- | publishing-docker.yml | 2 | ||||
-rw-r--r-- | roles/docker-fossology/defaults/main.yml (renamed from roles/fossology/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/docker-fossology/tasks/main.yml (renamed from roles/fossology/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/docker-fossology/templates/docker-compose.yml.j2 (renamed from roles/fossology/templates/docker-compose.yml.j2) | 0 | ||||
-rw-r--r-- | roles/docker-jenkins-master/tasks/main.yml (renamed from roles/jenkins-master/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/defaults/main.yml (renamed from roles/publishing-docker/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/files/apache-proxy.conf (renamed from roles/publishing-docker/files/apache-proxy.conf) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/files/docker_run.sh (renamed from roles/publishing-docker/files/docker_run.sh) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/files/event-watcher.py (renamed from roles/publishing-docker/files/event-watcher.py) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/files/proxy_settings.py (renamed from roles/publishing-docker/files/proxy_settings.py) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/handlers/main.yml (renamed from roles/publishing-docker/handlers/main.yml) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/meta/main.yml (renamed from roles/publishing-docker/meta/main.yml) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/tasks/deploy-site.yml (renamed from roles/publishing-docker/tasks/deploy-site.yml) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/tasks/main.yml (renamed from roles/publishing-docker/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/templates/allowed_hosts.txt (renamed from roles/publishing-docker/templates/allowed_hosts.txt) | 0 | ||||
-rw-r--r-- | roles/docker-publishing/templates/llp-crontab.cron (renamed from roles/publishing-docker/templates/llp-crontab.cron) | 0 |
18 files changed, 3 insertions, 3 deletions
diff --git a/fossology.yml b/fossology.yml index 44dc4c08..3f11c70c 100644 --- a/fossology.yml +++ b/fossology.yml @@ -9,6 +9,6 @@ - {role: ssh-ldap, tags: [ssh-ldap]} - {role: postfix, tags: [postfix]} - {role: docker-deps, tags: [docker-deps]} - - {role: fossology, tags: [docker]} + - {role: docker-fossology, tags: [docker]} - {role: certbot, tags: [certbot]} - {role: apache-site, src: "fossology/fossology.linaro.org.conf", config: "fossology.linaro.org", tags: [apache]} diff --git a/jenkins-master.yml b/jenkins-master.yml index 2c246137..27a84544 100644 --- a/jenkins-master.yml +++ b/jenkins-master.yml @@ -11,7 +11,7 @@ - {role: nfs-server, tags: [nfs]} - {role: docker-deps, tags: [jenkins-master,docker]} - {role: jenkins-master-deps, tags: [jenkins-master-deps]} - - {role: jenkins-master, tags: [jenkins-master,docker]} + - {role: docker-jenkins-master, tags: [jenkins-master,docker]} - {role: docker-tcwg-proxy, tags: [tcwg,docker]} - {role: certbot, tags: [certbot]} - {role: apache-site, src: "jenkins/ci.linaro.org.conf", config: "ci.linaro.org", tags: [apache]} diff --git a/publishing-docker.yml b/publishing-docker.yml index 69040c1c..a44a637c 100644 --- a/publishing-docker.yml +++ b/publishing-docker.yml @@ -6,4 +6,4 @@ - "{{secrets_dir}}/group_vars/all" roles: - {role: ssh-ldap, tags: [ssh-ldap]} - - {role: publishing-docker, tags: [docker]} + - {role: docker-publishing, tags: [docker]} diff --git a/roles/fossology/defaults/main.yml b/roles/docker-fossology/defaults/main.yml index c8f8dc58..c8f8dc58 100644 --- a/roles/fossology/defaults/main.yml +++ b/roles/docker-fossology/defaults/main.yml diff --git a/roles/fossology/tasks/main.yml b/roles/docker-fossology/tasks/main.yml index e314c5d2..e314c5d2 100644 --- a/roles/fossology/tasks/main.yml +++ b/roles/docker-fossology/tasks/main.yml diff --git a/roles/fossology/templates/docker-compose.yml.j2 b/roles/docker-fossology/templates/docker-compose.yml.j2 index 6322b711..6322b711 100644 --- a/roles/fossology/templates/docker-compose.yml.j2 +++ b/roles/docker-fossology/templates/docker-compose.yml.j2 diff --git a/roles/jenkins-master/tasks/main.yml b/roles/docker-jenkins-master/tasks/main.yml index 5445ab87..5445ab87 100644 --- a/roles/jenkins-master/tasks/main.yml +++ b/roles/docker-jenkins-master/tasks/main.yml diff --git a/roles/publishing-docker/defaults/main.yml b/roles/docker-publishing/defaults/main.yml index 8c00d00d..8c00d00d 100644 --- a/roles/publishing-docker/defaults/main.yml +++ b/roles/docker-publishing/defaults/main.yml diff --git a/roles/publishing-docker/files/apache-proxy.conf b/roles/docker-publishing/files/apache-proxy.conf index ebb43264..ebb43264 100644 --- a/roles/publishing-docker/files/apache-proxy.conf +++ b/roles/docker-publishing/files/apache-proxy.conf diff --git a/roles/publishing-docker/files/docker_run.sh b/roles/docker-publishing/files/docker_run.sh index 195d3770..195d3770 100644 --- a/roles/publishing-docker/files/docker_run.sh +++ b/roles/docker-publishing/files/docker_run.sh diff --git a/roles/publishing-docker/files/event-watcher.py b/roles/docker-publishing/files/event-watcher.py index 4158ba28..4158ba28 100644 --- a/roles/publishing-docker/files/event-watcher.py +++ b/roles/docker-publishing/files/event-watcher.py diff --git a/roles/publishing-docker/files/proxy_settings.py b/roles/docker-publishing/files/proxy_settings.py index f9e79de2..f9e79de2 100644 --- a/roles/publishing-docker/files/proxy_settings.py +++ b/roles/docker-publishing/files/proxy_settings.py diff --git a/roles/publishing-docker/handlers/main.yml b/roles/docker-publishing/handlers/main.yml index c1f65303..c1f65303 100644 --- a/roles/publishing-docker/handlers/main.yml +++ b/roles/docker-publishing/handlers/main.yml diff --git a/roles/publishing-docker/meta/main.yml b/roles/docker-publishing/meta/main.yml index eed5d92d..eed5d92d 100644 --- a/roles/publishing-docker/meta/main.yml +++ b/roles/docker-publishing/meta/main.yml diff --git a/roles/publishing-docker/tasks/deploy-site.yml b/roles/docker-publishing/tasks/deploy-site.yml index 26b0bab6..26b0bab6 100644 --- a/roles/publishing-docker/tasks/deploy-site.yml +++ b/roles/docker-publishing/tasks/deploy-site.yml diff --git a/roles/publishing-docker/tasks/main.yml b/roles/docker-publishing/tasks/main.yml index 899f93d4..899f93d4 100644 --- a/roles/publishing-docker/tasks/main.yml +++ b/roles/docker-publishing/tasks/main.yml diff --git a/roles/publishing-docker/templates/allowed_hosts.txt b/roles/docker-publishing/templates/allowed_hosts.txt index e69de29b..e69de29b 100644 --- a/roles/publishing-docker/templates/allowed_hosts.txt +++ b/roles/docker-publishing/templates/allowed_hosts.txt diff --git a/roles/publishing-docker/templates/llp-crontab.cron b/roles/docker-publishing/templates/llp-crontab.cron index eeaef2ed..eeaef2ed 100644 --- a/roles/publishing-docker/templates/llp-crontab.cron +++ b/roles/docker-publishing/templates/llp-crontab.cron |