From 6ad69f2a206b2f5aec9b5476f004756efa2b2388 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 23 Jun 2015 13:29:36 -0600 Subject: [PATCH] Move cobbler system population to new role This creates the new cobbler_systems role, which is run after the cobbler and cobbler_profile roles Signed-off-by: Zack Cerza --- cobbler.yml | 1 + roles/cobbler/tasks/main.yml | 17 +---------------- roles/cobbler/tasks/restart.yml | 9 +++++++++ roles/cobbler/tasks/settings.yml | 5 +---- roles/cobbler_systems/defaults/main.yml | 5 +++++ roles/cobbler_systems/tasks/main.yml | 8 ++++++++ .../tasks/populate_systems.yml | 0 7 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 roles/cobbler/tasks/restart.yml create mode 100644 roles/cobbler_systems/defaults/main.yml create mode 100644 roles/cobbler_systems/tasks/main.yml rename roles/{cobbler => cobbler_systems}/tasks/populate_systems.yml (100%) diff --git a/cobbler.yml b/cobbler.yml index 59de9c78..687c0a11 100644 --- a/cobbler.yml +++ b/cobbler.yml @@ -11,3 +11,4 @@ - { role: cobbler_profile, distro_name: Ubuntu-12.04-server-x86_64, tags: ['ubuntu-precise'] } - { role: cobbler_profile, distro_name: Ubuntu-14.04-server-x86_64, tags: ['ubuntu-trusty'] } - { role: cobbler_profile, distro_name: Ubuntu-15.04-server-x86_64, tags: ['ubuntu-vivid'] } + - cobbler_systems diff --git a/roles/cobbler/tasks/main.yml b/roles/cobbler/tasks/main.yml index dbaa7a73..b732767b 100644 --- a/roles/cobbler/tasks/main.yml +++ b/roles/cobbler/tasks/main.yml @@ -73,22 +73,7 @@ tags: - distros -- name: Restart cobbler - service: - name: "{{ cobbler_service }}" - state: restarted - changed_when: false - -- name: Wait for cobbler to start - wait_for: port={{ cobbler_port }} - -- include: populate_systems.yml - tags: - - systems - -- name: Run cobbler sync - command: cobbler sync - no_log: true +- include: restart.yml - name: Run cobbler check command: cobbler check diff --git a/roles/cobbler/tasks/restart.yml b/roles/cobbler/tasks/restart.yml new file mode 100644 index 00000000..f1ceb3cd --- /dev/null +++ b/roles/cobbler/tasks/restart.yml @@ -0,0 +1,9 @@ +--- +- name: Restart cobbler + service: + name: "{{ cobbler_service }}" + state: restarted + changed_when: false + +- name: Wait for cobbler to start + wait_for: port={{ cobbler_port }} diff --git a/roles/cobbler/tasks/settings.yml b/roles/cobbler/tasks/settings.yml index cadeaad8..d962d3c0 100644 --- a/roles/cobbler/tasks/settings.yml +++ b/roles/cobbler/tasks/settings.yml @@ -9,10 +9,7 @@ lineinfile: dest=/etc/cobbler/settings regexp="^server{{':'}}" line="server{{'\:'}} {% for setting in settings %}{% if setting.name == 'server' %}{{ setting.value }}{% endif %}{% endfor %}" register: server_value -- name: Restart cobbler - service: - name: "{{ cobbler_service }}" - state: restarted +- include: restart.yml when: dynamic_settings|changed or server_value|changed - name: Update settings diff --git a/roles/cobbler_systems/defaults/main.yml b/roles/cobbler_systems/defaults/main.yml new file mode 100644 index 00000000..db468e6a --- /dev/null +++ b/roles/cobbler_systems/defaults/main.yml @@ -0,0 +1,5 @@ +--- +interface: eth0 +kernel_options: '' +default_profile: "Ubuntu-14.04-server-x86_64" + diff --git a/roles/cobbler_systems/tasks/main.yml b/roles/cobbler_systems/tasks/main.yml new file mode 100644 index 00000000..25f6cd5e --- /dev/null +++ b/roles/cobbler_systems/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- include: populate_systems.yml + tags: + - systems + +- name: Run cobbler sync + command: cobbler sync + no_log: true diff --git a/roles/cobbler/tasks/populate_systems.yml b/roles/cobbler_systems/tasks/populate_systems.yml similarity index 100% rename from roles/cobbler/tasks/populate_systems.yml rename to roles/cobbler_systems/tasks/populate_systems.yml -- 2.47.3