From 7f9700209cb5847f42a7af3caa778abf7f7dae55 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Fri, 27 Mar 2015 22:37:28 -0400 Subject: [PATCH] Rename ironic-deploy role Changed the name of the ironic-deploy role to bifrost-validate-host-for-deploy to be in-line with what the role actually does which is perform basic node validation before the process proceeds. --- deploy.yaml | 2 +- roles/bifrost-setup-nodes/meta/main.yml | 2 +- .../README.md | 6 +++--- roles/bifrost-validate-host-for-deploy/defaults/main.yml | 2 ++ roles/bifrost-validate-host-for-deploy/handlers/main.yml | 2 ++ .../meta/main.yml | 4 ++-- .../tasks/main.yml | 0 roles/bifrost-validate-host-for-deploy/vars/main.yml | 2 ++ roles/ironic-deploy/defaults/main.yml | 2 -- roles/ironic-deploy/handlers/main.yml | 2 -- roles/ironic-deploy/vars/main.yml | 2 -- test-bifrost.yaml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename roles/{ironic-deploy => bifrost-validate-host-for-deploy}/README.md (82%) create mode 100644 roles/bifrost-validate-host-for-deploy/defaults/main.yml create mode 100644 roles/bifrost-validate-host-for-deploy/handlers/main.yml rename roles/{ironic-deploy => bifrost-validate-host-for-deploy}/meta/main.yml (95%) rename roles/{ironic-deploy => bifrost-validate-host-for-deploy}/tasks/main.yml (100%) create mode 100644 roles/bifrost-validate-host-for-deploy/vars/main.yml delete mode 100644 roles/ironic-deploy/defaults/main.yml delete mode 100644 roles/ironic-deploy/handlers/main.yml delete mode 100644 roles/ironic-deploy/vars/main.yml diff --git a/deploy.yaml b/deploy.yaml index f088ca460..23bf18516 100644 --- a/deploy.yaml +++ b/deploy.yaml @@ -9,7 +9,7 @@ local_action: fail msg="baremetal_csv_file must be defined for this playbook to execute, please pass option '-e baremetal_csv_file='" when: baremetal_csv_file is not defined roles: - - role: ironic-deploy + - role: bifrost-validate-host-for-deploy baremetal_csv_file: "{{ baremetal_csv_file }}" - hosts: localhost connection: local diff --git a/roles/bifrost-setup-nodes/meta/main.yml b/roles/bifrost-setup-nodes/meta/main.yml index 62971fd92..54e2105d7 100644 --- a/roles/bifrost-setup-nodes/meta/main.yml +++ b/roles/bifrost-setup-nodes/meta/main.yml @@ -114,5 +114,5 @@ galaxy_info: #- system #- web dependencies: -- ironic-deploy +- bifrost-validate-host-for-deploy - bifrost-configdrives diff --git a/roles/ironic-deploy/README.md b/roles/bifrost-validate-host-for-deploy/README.md similarity index 82% rename from roles/ironic-deploy/README.md rename to roles/bifrost-validate-host-for-deploy/README.md index 4891b4918..a5c6e7d33 100644 --- a/roles/ironic-deploy/README.md +++ b/roles/bifrost-validate-host-for-deploy/README.md @@ -1,7 +1,7 @@ -ironic-deploy -============= +bifrost-validate-host-for-deploy +================================ -Preforms basic sanity checks as part of Bifrost before nodes are provisioned. +Preforms basic sanity checks of an Ironic node as part of Bifrost host before nodes are provisioned. Requirements ------------ diff --git a/roles/bifrost-validate-host-for-deploy/defaults/main.yml b/roles/bifrost-validate-host-for-deploy/defaults/main.yml new file mode 100644 index 000000000..facda7396 --- /dev/null +++ b/roles/bifrost-validate-host-for-deploy/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for bifrost-validate-host-for-deploy diff --git a/roles/bifrost-validate-host-for-deploy/handlers/main.yml b/roles/bifrost-validate-host-for-deploy/handlers/main.yml new file mode 100644 index 000000000..0d75bfb62 --- /dev/null +++ b/roles/bifrost-validate-host-for-deploy/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for ironic-bifrost-validate-host-for-deploy diff --git a/roles/ironic-deploy/meta/main.yml b/roles/bifrost-validate-host-for-deploy/meta/main.yml similarity index 95% rename from roles/ironic-deploy/meta/main.yml rename to roles/bifrost-validate-host-for-deploy/meta/main.yml index 12a56b50c..ae12c3ff3 100644 --- a/roles/ironic-deploy/meta/main.yml +++ b/roles/bifrost-validate-host-for-deploy/meta/main.yml @@ -1,13 +1,13 @@ --- galaxy_info: author: Ironic Developers - description: + description: company: OpenStack license: Apache min_ansible_version: 1.9 # # Below are all platforms currently available. Just uncomment - # the ones that apply to your role. If you don't see your + # the ones that apply to your role. If you don't see your # platform on this list, let us know and we'll get it added! # platforms: diff --git a/roles/ironic-deploy/tasks/main.yml b/roles/bifrost-validate-host-for-deploy/tasks/main.yml similarity index 100% rename from roles/ironic-deploy/tasks/main.yml rename to roles/bifrost-validate-host-for-deploy/tasks/main.yml diff --git a/roles/bifrost-validate-host-for-deploy/vars/main.yml b/roles/bifrost-validate-host-for-deploy/vars/main.yml new file mode 100644 index 000000000..db2d70ddc --- /dev/null +++ b/roles/bifrost-validate-host-for-deploy/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for bifrost-validate-host-for-deploy diff --git a/roles/ironic-deploy/defaults/main.yml b/roles/ironic-deploy/defaults/main.yml deleted file mode 100644 index 60d7bb7a8..000000000 --- a/roles/ironic-deploy/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for ironic-deploy diff --git a/roles/ironic-deploy/handlers/main.yml b/roles/ironic-deploy/handlers/main.yml deleted file mode 100644 index 13dd10b42..000000000 --- a/roles/ironic-deploy/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for ironic-deploy diff --git a/roles/ironic-deploy/vars/main.yml b/roles/ironic-deploy/vars/main.yml deleted file mode 100644 index 7cbd2992d..000000000 --- a/roles/ironic-deploy/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for ironic-deploy diff --git a/test-bifrost.yaml b/test-bifrost.yaml index fcc26e259..5449f785b 100644 --- a/test-bifrost.yaml +++ b/test-bifrost.yaml @@ -14,7 +14,7 @@ testing: true - role: ironic-enroll testing: true - - role: ironic-deploy + - role: bifrost-validate-host-for-deploy - hosts: localhost connection: local name: "Executes install, enrollment, and testing in one playbook"