diff --git a/playbooks/roles/bifrost-configdrives-dynamic/README.md b/playbooks/roles/bifrost-configdrives-dynamic/README.md index 5ed4e3b42..264698c33 100644 --- a/playbooks/roles/bifrost-configdrives-dynamic/README.md +++ b/playbooks/roles/bifrost-configdrives-dynamic/README.md @@ -7,8 +7,8 @@ Requirements ------------ This playbook is intended to be executed prior to the deployments of nodes -via the bifrost-setup-nodes role, as part of bifrost. It creates a basic -configuration drive containing network configuration and an SSH key +via the bifrost-deploy-nodes-dynamic role, as part of bifrost. It creates a +basic configuration drive containing network configuration and an SSH key permitting the user to login to the host. Role Variables diff --git a/playbooks/roles/bifrost-deploy-nodes-dynamic/README.md b/playbooks/roles/bifrost-deploy-nodes-dynamic/README.md index 51a818e01..18c9a80eb 100644 --- a/playbooks/roles/bifrost-deploy-nodes-dynamic/README.md +++ b/playbooks/roles/bifrost-deploy-nodes-dynamic/README.md @@ -70,7 +70,7 @@ NOTE: The example below assumes bifrost's default and that an instance_info sudo: no roles: - role: bifrost-configdrives - - role: bifrost-setup-nodes + - role: bifrost-deploy-nodes-dynamic License ------- diff --git a/playbooks/roles/bifrost-setup-nodes/README.md b/playbooks/roles/bifrost-setup-nodes/README.md deleted file mode 100644 index 20592da3d..000000000 --- a/playbooks/roles/bifrost-setup-nodes/README.md +++ /dev/null @@ -1,89 +0,0 @@ -Role Name -========= - -Provisions nodes based on the contents of the file designated by -baremetal_csv_file utilizing the os_ironic_node installed by Bifrost. - -Requirements ------------- - -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 -path to the CSV file which is utilized as the source of information for this -role to operate. - -Role Variables --------------- - -baremetal_csv_file: This is the variable that references the CSV file which is -utilized as the source of information for nodes to execute the role upon. This -variable does not have a default in this role and expects to receive this -information from the calling playbook. - -ironic_url: This is the URL to the ironic server. By default, this is set to - "http://localhost:6385/" - -network_interface: This is the network interface that the nodes receive - DHCP/PXE/iPXE. This is utilized to generate the url that - Ironic is configured with for image retrieval. This variable - does not have a default in this role and expects to receive - this information from the calling playbook. - -deploy_image_filename: This is the filename of the image to deploy, which is - combined with the network_interface variable to generate - a URL used to set the Ironic instance image_source. This - variable does not have a default in this role and - expects to receive this information from the calling - playbook. - -deploy_image: This is the full path to the image to be deployed to the system. - This is as Ironic requires the MD5 hash of the file to be - deployed for validation during the deployment process. As a - result of this requirement, the hash is automatically collected - and submitted to Ironic with the node deployment request. This - variable does not have a default in this role and expects to - receive this information from the calling playbook. - -Dependencies ------------- - -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 ----------------- - -- hosts: localhost - connection: local - sudo: no - roles: - - role: bifrost-configdrives - - role: bifrost-setup-nodes - -License -------- - -Copyright (c) 2015 Hewlett-Packard Development Company, L.P. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -Author Information ------------------- - -Ironic Developers diff --git a/playbooks/roles/bifrost-setup-nodes/defaults/main.yml b/playbooks/roles/bifrost-setup-nodes/defaults/main.yml deleted file mode 100644 index 9fb76e0ac..000000000 --- a/playbooks/roles/bifrost-setup-nodes/defaults/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -# defaults file for bifrost-setup-nodes -ironic_url: "http://localhost:6385/" diff --git a/playbooks/roles/bifrost-setup-nodes/handlers/main.yml b/playbooks/roles/bifrost-setup-nodes/handlers/main.yml deleted file mode 100644 index dc8166578..000000000 --- a/playbooks/roles/bifrost-setup-nodes/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for bifrost-setup-nodes diff --git a/playbooks/roles/bifrost-setup-nodes/meta/main.yml b/playbooks/roles/bifrost-setup-nodes/meta/main.yml deleted file mode 100644 index f63486e03..000000000 --- a/playbooks/roles/bifrost-setup-nodes/meta/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -galaxy_info: - author: Ironic Developers - description: Deploys the image on to nodes in Ironic - company: OpenStack - license: Apache - min_ansible_version: 1.9 - platforms: - - name: EL - versions: - - 7 - - name: Debian - versions: - - wheezy - - name: Ubuntu - versions: - - trusty - - utopic - categories: - - cloud - - cloud:openstack -dependencies: [] diff --git a/playbooks/roles/bifrost-setup-nodes/tasks/main.yml b/playbooks/roles/bifrost-setup-nodes/tasks/main.yml deleted file mode 100644 index 3cd7c0d72..000000000 --- a/playbooks/roles/bifrost-setup-nodes/tasks/main.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2015 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -- name: "Collect the checksum of the deployment image." - local_action: stat path={{deploy_image}} - register: test_deploy_image -- name: "Deploy to hardware" - os_ironic_node: - auth_type: None - auth: None - ironic_url: "{{ ironic_url }}" - uuid: "{{item.split(',')[9]}}" - state: present - config_drive: "http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:{{nginx_port}}/configdrive-{{item.split(',')[9]}}.iso.gz" - instance_info: - image_source: "http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:{{nginx_port}}/{{deploy_image_filename}}" - image_checksum: "{{ test_deploy_image.stat.md5 }}" - image_disk_format: "raw" - root_gb: 10 - delegate_to: localhost - with_lines: - - cat {{ baremetal_csv_file }} diff --git a/playbooks/roles/bifrost-setup-nodes/vars/main.yml b/playbooks/roles/bifrost-setup-nodes/vars/main.yml deleted file mode 100644 index a4473eb78..000000000 --- a/playbooks/roles/bifrost-setup-nodes/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for bifrost-setup-nodes