diff --git a/playbooks/install.yaml b/playbooks/install.yaml index fc3f5b94d..c9af0edf4 100644 --- a/playbooks/install.yaml +++ b/playbooks/install.yaml @@ -6,7 +6,7 @@ gather_facts: yes roles: - { role: bifrost-prep-for-install, when: skip_install is not defined } - - ironic-install + - bifrost-ironic-install - { role: bifrost-create-dib-image, dib_imagename: "{{ deploy_image }}", dib_imagetype: "qcow2", dib_os_element: "{{ dib_os_element|default('debian') }}", dib_elements: "vm serial-console simple-init {{ extra_dib_elements|default('') }}", dib_packages: "{{ dib_packages|default('') }}", when: create_image_via_dib == true and transform_boot_image == false } environment: http_proxy: "{{ lookup('env','http_proxy') }}" diff --git a/playbooks/roles/bifrost-configdrives-dynamic/README.md b/playbooks/roles/bifrost-configdrives-dynamic/README.md index d9d96b166..cf7856e19 100644 --- a/playbooks/roles/bifrost-configdrives-dynamic/README.md +++ b/playbooks/roles/bifrost-configdrives-dynamic/README.md @@ -88,9 +88,9 @@ Dependencies ------------ This role is expected to be executed on a system that has had the -ironic-install role executed upon it, however as the configuration -drive creation step is fairly self contained, it can be executed -as a separate step. +bifrost-ironic-install role executed upon it, however as the configuration +drive creation step is fairly self contained, it can be executed as a +separate step. Example Playbook ---------------- diff --git a/playbooks/roles/bifrost-deploy-nodes-dynamic/README.md b/playbooks/roles/bifrost-deploy-nodes-dynamic/README.md index 3dc527797..802268593 100644 --- a/playbooks/roles/bifrost-deploy-nodes-dynamic/README.md +++ b/playbooks/roles/bifrost-deploy-nodes-dynamic/README.md @@ -7,8 +7,8 @@ installed by Bifrost. Requirements ------------ -This role is expected to be executed on a node that the "ironic-install" node -has been executed upon. +This role is expected to be executed on a node that the +"bifrost-ironic-install" node has been executed upon. This role expects to be executed in a sequence with bifrost-configdrives-dynamic, however that is un-necessary IF the host has a @@ -53,10 +53,11 @@ instance_info: A dictionary containing the information to define an instance. Dependencies ------------ -This role is intended to be executed upon a node that the ironic-install role -has been executed upon. The configuration that is leveraged by this role -utilizes a configuration drive to place network configuration and an SSH key on -the newly deployed host. As such, the bifrost-configdrives role is required. +This role is intended to be executed upon a node that the +bifrost-ironic-install role has been executed upon. The configuration that +is leveraged by this role utilizes a configuration drive to place network +configuration and an SSH key on the newly deployed host. As such, the +bifrost-configdrives role is required. Example Playbook ---------------- diff --git a/playbooks/roles/ironic-install/README.md b/playbooks/roles/bifrost-ironic-install/README.md similarity index 100% rename from playbooks/roles/ironic-install/README.md rename to playbooks/roles/bifrost-ironic-install/README.md diff --git a/playbooks/roles/ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml similarity index 100% rename from playbooks/roles/ironic-install/defaults/main.yml rename to playbooks/roles/bifrost-ironic-install/defaults/main.yml diff --git a/playbooks/roles/ironic-install/defaults/required_defaults_Debian.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian.yml similarity index 100% rename from playbooks/roles/ironic-install/defaults/required_defaults_Debian.yml rename to playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian.yml diff --git a/playbooks/roles/ironic-install/defaults/required_defaults_RedHat.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat.yml similarity index 100% rename from playbooks/roles/ironic-install/defaults/required_defaults_RedHat.yml rename to playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat.yml diff --git a/playbooks/roles/ironic-install/files/boot.ipxe b/playbooks/roles/bifrost-ironic-install/files/boot.ipxe similarity index 100% rename from playbooks/roles/ironic-install/files/boot.ipxe rename to playbooks/roles/bifrost-ironic-install/files/boot.ipxe diff --git a/playbooks/roles/ironic-install/files/tftpboot-map-file b/playbooks/roles/bifrost-ironic-install/files/tftpboot-map-file similarity index 100% rename from playbooks/roles/ironic-install/files/tftpboot-map-file rename to playbooks/roles/bifrost-ironic-install/files/tftpboot-map-file diff --git a/playbooks/roles/ironic-install/files/xinetd.tftp b/playbooks/roles/bifrost-ironic-install/files/xinetd.tftp similarity index 100% rename from playbooks/roles/ironic-install/files/xinetd.tftp rename to playbooks/roles/bifrost-ironic-install/files/xinetd.tftp diff --git a/playbooks/roles/ironic-install/meta/main.yml b/playbooks/roles/bifrost-ironic-install/meta/main.yml similarity index 100% rename from playbooks/roles/ironic-install/meta/main.yml rename to playbooks/roles/bifrost-ironic-install/meta/main.yml diff --git a/playbooks/roles/ironic-install/tasks/create_tftpboot.yml b/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml similarity index 100% rename from playbooks/roles/ironic-install/tasks/create_tftpboot.yml rename to playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml diff --git a/playbooks/roles/ironic-install/tasks/dib_install.yml b/playbooks/roles/bifrost-ironic-install/tasks/dib_install.yml similarity index 100% rename from playbooks/roles/ironic-install/tasks/dib_install.yml rename to playbooks/roles/bifrost-ironic-install/tasks/dib_install.yml diff --git a/playbooks/roles/ironic-install/tasks/download_ipa_image.yml b/playbooks/roles/bifrost-ironic-install/tasks/download_ipa_image.yml similarity index 100% rename from playbooks/roles/ironic-install/tasks/download_ipa_image.yml rename to playbooks/roles/bifrost-ironic-install/tasks/download_ipa_image.yml diff --git a/playbooks/roles/ironic-install/tasks/ironic_config.yml b/playbooks/roles/bifrost-ironic-install/tasks/ironic_config.yml similarity index 100% rename from playbooks/roles/ironic-install/tasks/ironic_config.yml rename to playbooks/roles/bifrost-ironic-install/tasks/ironic_config.yml diff --git a/playbooks/roles/ironic-install/tasks/main.yml b/playbooks/roles/bifrost-ironic-install/tasks/main.yml similarity index 100% rename from playbooks/roles/ironic-install/tasks/main.yml rename to playbooks/roles/bifrost-ironic-install/tasks/main.yml diff --git a/playbooks/roles/ironic-install/templates/agent_config.template.j2 b/playbooks/roles/bifrost-ironic-install/templates/agent_config.template.j2 similarity index 100% rename from playbooks/roles/ironic-install/templates/agent_config.template.j2 rename to playbooks/roles/bifrost-ironic-install/templates/agent_config.template.j2 diff --git a/playbooks/roles/ironic-install/templates/dnsmasq.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2 similarity index 100% rename from playbooks/roles/ironic-install/templates/dnsmasq.conf.j2 rename to playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2 diff --git a/playbooks/roles/ironic-install/templates/nginx.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/nginx.conf.j2 similarity index 100% rename from playbooks/roles/ironic-install/templates/nginx.conf.j2 rename to playbooks/roles/bifrost-ironic-install/templates/nginx.conf.j2 diff --git a/playbooks/roles/ironic-install/templates/systemd_template.j2 b/playbooks/roles/bifrost-ironic-install/templates/systemd_template.j2 similarity index 100% rename from playbooks/roles/ironic-install/templates/systemd_template.j2 rename to playbooks/roles/bifrost-ironic-install/templates/systemd_template.j2 diff --git a/playbooks/roles/ironic-install/templates/upstart_template.j2 b/playbooks/roles/bifrost-ironic-install/templates/upstart_template.j2 similarity index 100% rename from playbooks/roles/ironic-install/templates/upstart_template.j2 rename to playbooks/roles/bifrost-ironic-install/templates/upstart_template.j2 diff --git a/playbooks/roles/bifrost-prep-for-install/README.md b/playbooks/roles/bifrost-prep-for-install/README.md index 3990c6f18..33d6ec902 100644 --- a/playbooks/roles/bifrost-prep-for-install/README.md +++ b/playbooks/roles/bifrost-prep-for-install/README.md @@ -61,7 +61,7 @@ Example Playbook gather_facts: yes roles: - { role: bifrost-prep-for-install, when: skip_install is not defined } - - role: ironic-install + - role: bifrost-ironic-install cleaning: false testing: true diff --git a/playbooks/roles/bifrost-setup-nodes/README.md b/playbooks/roles/bifrost-setup-nodes/README.md index cb1e868d0..20592da3d 100644 --- a/playbooks/roles/bifrost-setup-nodes/README.md +++ b/playbooks/roles/bifrost-setup-nodes/README.md @@ -7,8 +7,8 @@ baremetal_csv_file utilizing the os_ironic_node installed by Bifrost. Requirements ------------ -This role is expected to be executed on a node that the "ironic-install" node -has been executed upon. +This role is expected to be executed on a node that the +"bifrost-ironic-install" node has been executed upon. As configured, this role requires the "bifrost-configdrives" role be executed prior to this role, utilizing the baremetal_csv_file variable which defines the @@ -50,10 +50,11 @@ deploy_image: This is the full path to the image to be deployed to the system. Dependencies ------------ -This role is intended to be executed upon a node that the ironic-install role -has been executed upon. The configuration that is leveraged by this role -utilizes a configuration drive to place network configuration and an SSH key on -the newly deployed host. As such, the bifrost-configdrives role is required. +This role is intended to be executed upon a node that the +bifrost-ironic-install role has been executed upon. The configuration that +is leveraged by this role utilizes a configuration drive to place network +configuration and an SSH key on the newly deployed host. As such, +the bifrost-configdrives role is required. Example Playbook ---------------- diff --git a/playbooks/roles/bifrost-unprovision-node-dynamic/README.md b/playbooks/roles/bifrost-unprovision-node-dynamic/README.md index 5e1d19c16..1328138ec 100644 --- a/playbooks/roles/bifrost-unprovision-node-dynamic/README.md +++ b/playbooks/roles/bifrost-unprovision-node-dynamic/README.md @@ -23,7 +23,7 @@ Dependencies ------------ This role has no roles that it is directly dependent upon, but expects that the -environment has been installed with the ironic-install role. +environment has been installed with the bifrost-ironic-install role. Example Playbook ---------------- diff --git a/playbooks/roles/ironic-enroll-dynamic/README.md b/playbooks/roles/ironic-enroll-dynamic/README.md index 59d471547..d95fbaf95 100644 --- a/playbooks/roles/ironic-enroll-dynamic/README.md +++ b/playbooks/roles/ironic-enroll-dynamic/README.md @@ -63,8 +63,8 @@ driver required. Dependencies ------------ -This role is presently dependent upon the ironic-install role which installs -the necessary requirements. +This role is presently dependent upon the bifrost-ironic-install role which +installs the necessary requirements. Example Playbook ---------------- diff --git a/playbooks/test-bifrost-dynamic.yaml b/playbooks/test-bifrost-dynamic.yaml index af28ed034..41acf92ab 100644 --- a/playbooks/test-bifrost-dynamic.yaml +++ b/playbooks/test-bifrost-dynamic.yaml @@ -48,7 +48,7 @@ when: ci_testing is defined roles: - role: bifrost-create-vm-nodes - - role: ironic-install + - role: bifrost-ironic-install cleaning: false testing: true - { role: bifrost-create-dib-image, dib_imagetype: "qcow2", dib_imagename: "{{deploy_image}}", dib_os_element: "{{ dib_os_element|default('debian') }}", dib_elements: "vm serial-console simple-init {{ extra_dib_elements|default('') }}", dib_packages: "{{ dib_packages|default('') }}", when: create_image_via_dib == true and transform_boot_image == false }