From 4323f721a105762771b10daee813db7b13270a6d Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Thu, 17 Nov 2016 10:02:32 -0800 Subject: [PATCH] Standardize task file names Update task files names to match standard naming convention of OSA roles. Change-Id: Ia1b9267978582d90900df5eb9bac802103183956 --- tasks/{apache.yml => barbican_apache.yml} | 0 tasks/{database-setup.yml => barbican_db_setup.yml} | 0 tasks/{init.yml => barbican_init.yml} | 2 +- tasks/{init_common.yml => barbican_init_common.yml} | 4 ++-- .../{init_systemd.yml => barbican_init_systemd.yml} | 0 .../{init_upstart.yml => barbican_init_upstart.yml} | 0 tasks/{install.yml => barbican_install.yml} | 0 .../{post-install.yml => barbican_post_install.yml} | 0 tasks/{pre-install.yml => barbican_pre_install.yml} | 0 ...{service-setup.yml => barbican_service_setup.yml} | 0 tasks/{ssl.yml => barbican_ssl.yml} | 4 ++-- ...reate-ssl-key.yml => barbican_ssl_key_create.yml} | 0 ...e-ssl-key.yml => barbican_ssl_key_distribute.yml} | 0 ...{store-ssl-key.yml => barbican_ssl_key_store.yml} | 0 ...f-signed-ssl.yml => barbican_ssl_self_signed.yml} | 6 +++--- ...ovided-ssl.yml => barbican_ssl_user_provided.yml} | 0 tasks/main.yml | 12 ++++++------ 17 files changed, 14 insertions(+), 14 deletions(-) rename tasks/{apache.yml => barbican_apache.yml} (100%) rename tasks/{database-setup.yml => barbican_db_setup.yml} (100%) rename tasks/{init.yml => barbican_init.yml} (96%) rename tasks/{init_common.yml => barbican_init_common.yml} (91%) rename tasks/{init_systemd.yml => barbican_init_systemd.yml} (100%) rename tasks/{init_upstart.yml => barbican_init_upstart.yml} (100%) rename tasks/{install.yml => barbican_install.yml} (100%) rename tasks/{post-install.yml => barbican_post_install.yml} (100%) rename tasks/{pre-install.yml => barbican_pre_install.yml} (100%) rename tasks/{service-setup.yml => barbican_service_setup.yml} (100%) rename tasks/{ssl.yml => barbican_ssl.yml} (89%) rename tasks/{create-ssl-key.yml => barbican_ssl_key_create.yml} (100%) rename tasks/{distribute-ssl-key.yml => barbican_ssl_key_distribute.yml} (100%) rename tasks/{store-ssl-key.yml => barbican_ssl_key_store.yml} (100%) rename tasks/{self-signed-ssl.yml => barbican_ssl_self_signed.yml} (86%) rename tasks/{user-provided-ssl.yml => barbican_ssl_user_provided.yml} (100%) diff --git a/tasks/apache.yml b/tasks/barbican_apache.yml similarity index 100% rename from tasks/apache.yml rename to tasks/barbican_apache.yml diff --git a/tasks/database-setup.yml b/tasks/barbican_db_setup.yml similarity index 100% rename from tasks/database-setup.yml rename to tasks/barbican_db_setup.yml diff --git a/tasks/init.yml b/tasks/barbican_init.yml similarity index 96% rename from tasks/init.yml rename to tasks/barbican_init.yml index bb3ddae..99b544d 100644 --- a/tasks/init.yml +++ b/tasks/barbican_init.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: init_common.yml +- include: barbican_init_common.yml vars: program_name: "{{ barbican_uwsgi_program_name }}" program_config_options: "{{ barbican_uwsgi_options }}" diff --git a/tasks/init_common.yml b/tasks/barbican_init_common.yml similarity index 91% rename from tasks/init_common.yml rename to tasks/barbican_init_common.yml index aacf32f..11b108b 100644 --- a/tasks/init_common.yml +++ b/tasks/barbican_init_common.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: init_upstart.yml +- include: barbican_init_upstart.yml static: no when: - ansible_service_mgr == 'upstart' -- include: init_systemd.yml +- include: barbican_init_systemd.yml static: no when: - ansible_service_mgr == 'systemd' diff --git a/tasks/init_systemd.yml b/tasks/barbican_init_systemd.yml similarity index 100% rename from tasks/init_systemd.yml rename to tasks/barbican_init_systemd.yml diff --git a/tasks/init_upstart.yml b/tasks/barbican_init_upstart.yml similarity index 100% rename from tasks/init_upstart.yml rename to tasks/barbican_init_upstart.yml diff --git a/tasks/install.yml b/tasks/barbican_install.yml similarity index 100% rename from tasks/install.yml rename to tasks/barbican_install.yml diff --git a/tasks/post-install.yml b/tasks/barbican_post_install.yml similarity index 100% rename from tasks/post-install.yml rename to tasks/barbican_post_install.yml diff --git a/tasks/pre-install.yml b/tasks/barbican_pre_install.yml similarity index 100% rename from tasks/pre-install.yml rename to tasks/barbican_pre_install.yml diff --git a/tasks/service-setup.yml b/tasks/barbican_service_setup.yml similarity index 100% rename from tasks/service-setup.yml rename to tasks/barbican_service_setup.yml diff --git a/tasks/ssl.yml b/tasks/barbican_ssl.yml similarity index 89% rename from tasks/ssl.yml rename to tasks/barbican_ssl.yml index 1210b1b..1dccee1 100644 --- a/tasks/ssl.yml +++ b/tasks/barbican_ssl.yml @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: self-signed-ssl.yml +- include: barbican_ssl_self_signed.yml static: no when: - barbican_ssl | bool - barbican_user_ssl_cert is not defined or barbican_user_ssl_key is not defined -- include: user-provided-ssl.yml +- include: barbican_ssl_user_provided.yml diff --git a/tasks/create-ssl-key.yml b/tasks/barbican_ssl_key_create.yml similarity index 100% rename from tasks/create-ssl-key.yml rename to tasks/barbican_ssl_key_create.yml diff --git a/tasks/distribute-ssl-key.yml b/tasks/barbican_ssl_key_distribute.yml similarity index 100% rename from tasks/distribute-ssl-key.yml rename to tasks/barbican_ssl_key_distribute.yml diff --git a/tasks/store-ssl-key.yml b/tasks/barbican_ssl_key_store.yml similarity index 100% rename from tasks/store-ssl-key.yml rename to tasks/barbican_ssl_key_store.yml diff --git a/tasks/self-signed-ssl.yml b/tasks/barbican_ssl_self_signed.yml similarity index 86% rename from tasks/self-signed-ssl.yml rename to tasks/barbican_ssl_self_signed.yml index 5897420..1079e07 100644 --- a/tasks/self-signed-ssl.yml +++ b/tasks/barbican_ssl_self_signed.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: create-ssl-key.yml +- include: barbican_ssl_key_create.yml when: inventory_hostname == groups['barbican_all'][0] -- include: store-ssl-key.yml +- include: barbican_ssl_key_store.yml when: inventory_hostname == groups['barbican_all'][0] -- include: distribute-ssl-key.yml +- include: barbican_ssl_key_distribute.yml when: inventory_hostname != groups['barbican_all'][0] diff --git a/tasks/user-provided-ssl.yml b/tasks/barbican_ssl_user_provided.yml similarity index 100% rename from tasks/user-provided-ssl.yml rename to tasks/barbican_ssl_user_provided.yml diff --git a/tasks/main.yml b/tasks/main.yml index aaf3bac..9f232d5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -26,30 +26,30 @@ tags: - always -- include: pre-install.yml +- include: barbican_pre_install.yml tags: - barbican-install -- include: install.yml +- include: barbican_install.yml tags: - barbican-install -- include: post-install.yml +- include: barbican_post_install.yml tags: - barbican-install - barbican-config -- include: init.yml +- include: barbican_init.yml tags: - barbican-install - barbican-config -- include: database-setup.yml +- include: barbican_db_setup.yml when: inventory_hostname == groups['barbican_all'][0] tags: - barbican-install -- include: service-setup.yml +- include: barbican_service_setup.yml when: inventory_hostname == groups['barbican_all'][0] tags: - barbican-install