From 02383a41618eaa44992b528760fcaef4394f5668 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Wed, 29 Apr 2015 15:17:22 +0200 Subject: [PATCH] Rename deploy_site_pp to deploy_system_config We deploy a whole system-config repo, not just site.pp, thus rename makes more sense --- deploy_site_pp.yml | 6 ------ deploy_system_config.pp | 6 ++++++ .../tasks/clone_system_config_locally.yml | 0 .../tasks/commit_push.yml | 0 .../tasks/create_temp_folder.yml | 0 .../tasks/generate_site_pp.yml | 0 .../{deploy_site_pp => deploy_system_config}/tasks/main.yml | 0 .../templates/site.pp.j2 | 0 site.yml | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 deploy_site_pp.yml create mode 100644 deploy_system_config.pp rename roles/{deploy_site_pp => deploy_system_config}/tasks/clone_system_config_locally.yml (100%) rename roles/{deploy_site_pp => deploy_system_config}/tasks/commit_push.yml (100%) rename roles/{deploy_site_pp => deploy_system_config}/tasks/create_temp_folder.yml (100%) rename roles/{deploy_site_pp => deploy_system_config}/tasks/generate_site_pp.yml (100%) rename roles/{deploy_site_pp => deploy_system_config}/tasks/main.yml (100%) rename roles/{deploy_site_pp => deploy_system_config}/templates/site.pp.j2 (100%) diff --git a/deploy_site_pp.yml b/deploy_site_pp.yml deleted file mode 100644 index f2234de..0000000 --- a/deploy_site_pp.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# file: deploy_site_pp.yml -- hosts: localhost - connection: local - roles: - - { role: deploy_site_pp } diff --git a/deploy_system_config.pp b/deploy_system_config.pp new file mode 100644 index 0000000..f29730f --- /dev/null +++ b/deploy_system_config.pp @@ -0,0 +1,6 @@ +--- +# file: deploy_system_config.yml +- hosts: localhost + connection: local + roles: + - { role: deploy_system_config } diff --git a/roles/deploy_site_pp/tasks/clone_system_config_locally.yml b/roles/deploy_system_config/tasks/clone_system_config_locally.yml similarity index 100% rename from roles/deploy_site_pp/tasks/clone_system_config_locally.yml rename to roles/deploy_system_config/tasks/clone_system_config_locally.yml diff --git a/roles/deploy_site_pp/tasks/commit_push.yml b/roles/deploy_system_config/tasks/commit_push.yml similarity index 100% rename from roles/deploy_site_pp/tasks/commit_push.yml rename to roles/deploy_system_config/tasks/commit_push.yml diff --git a/roles/deploy_site_pp/tasks/create_temp_folder.yml b/roles/deploy_system_config/tasks/create_temp_folder.yml similarity index 100% rename from roles/deploy_site_pp/tasks/create_temp_folder.yml rename to roles/deploy_system_config/tasks/create_temp_folder.yml diff --git a/roles/deploy_site_pp/tasks/generate_site_pp.yml b/roles/deploy_system_config/tasks/generate_site_pp.yml similarity index 100% rename from roles/deploy_site_pp/tasks/generate_site_pp.yml rename to roles/deploy_system_config/tasks/generate_site_pp.yml diff --git a/roles/deploy_site_pp/tasks/main.yml b/roles/deploy_system_config/tasks/main.yml similarity index 100% rename from roles/deploy_site_pp/tasks/main.yml rename to roles/deploy_system_config/tasks/main.yml diff --git a/roles/deploy_site_pp/templates/site.pp.j2 b/roles/deploy_system_config/templates/site.pp.j2 similarity index 100% rename from roles/deploy_site_pp/templates/site.pp.j2 rename to roles/deploy_system_config/templates/site.pp.j2 diff --git a/site.yml b/site.yml index 40aee34..08b82e4 100644 --- a/site.yml +++ b/site.yml @@ -2,7 +2,7 @@ # file: site.yml - include: common.yml - include: set_hostnames.yml -- include: deploy_site_pp.yml +- include: deploy_system_config.yml - include: deploy_hiera.yml - include: bootstrap_puppetmaster.yml - include: bootstrap_puppet_infra_nodes.yml