From 11b48fe4e237950f9d9e9a0e66d8b15f48be1ea0 Mon Sep 17 00:00:00 2001
From: Eric Sauer <etsauer@gmail.com>
Date: Wed, 21 Dec 2016 10:37:40 -0500
Subject: Openstack heat (#2)
* Adding a role to invoke openstack heat
* Adding readme
* Pulling parameters out to inventory file
* start of end-to-end playbook
* More enhancements and refactoring to make dynamic inventory the driver for an openshift install
* Switching to variable substituted path to config.yaml playbook
* Changes to allow defining of number of nodes/infranodes.
* Added labels to inventory
* Start of end-to-end functionality
* Enhancements to support openstack heat provisioning
* Updating inventory sample to remove some deprecation warnings
* Working towards making the secure-registry role 'become' aware
* Fixing node labels and removing secure-registry as it's no longer needed
* No longer need insecure registry line, as installer will secure our registry
* Adjusted dynamic inventory to filter by clusterid
* Minor updates to dynamic inventory bug
* Adding a refactored sample inventory directory
* Refactoring playbooks for better directory structure, and to narrow down host groups
* Adding volume mounts to heat template
* Moving dns playbooks back to original location
* Fixing incorrect file path
* Cleaning up inventory samples
* One more hostname to clean up
* Changing var name
* changed openshift-provision to openshift-prep
* Adjusting current provision script to avoid breakage by new openstack-heat code
---
roles/openstack-stack/tasks/main.yml | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 roles/openstack-stack/tasks/main.yml
(limited to 'roles/openstack-stack/tasks')
diff --git a/roles/openstack-stack/tasks/main.yml b/roles/openstack-stack/tasks/main.yml
new file mode 100644
index 000000000..c953cb603
--- /dev/null
+++ b/roles/openstack-stack/tasks/main.yml
@@ -0,0 +1,31 @@
+---
+- name: create stack
+ ignore_errors: False
+ register: stack_create
+ os_stack:
+ name: "{{ stack_name }}"
+ state: present
+ template: 'roles/openstack-stack/files/heat_stack.yaml'
+ wait: yes
+ parameters:
+ cluster_env: "{{ dns_domain }}"
+ cluster_id: "{{ stack_name }}"
+ subnet_24_prefix: "{{ subnet_prefix }}"
+ dns_nameservers: "{{ dns_nameservers }}"
+ external_net: "{{ external_network }}"
+ ssh_public_key: "{{ ssh_public_key }}"
+ num_etcd: "{{ num_etcd }}"
+ num_masters: "{{ num_masters }}"
+ num_nodes: "{{ num_nodes }}"
+ num_infra: "{{ num_infra }}"
+ num_dns: "{{ num_dns }}"
+ etcd_image: "{{ openstack_image }}"
+ master_image: "{{ openstack_image }}"
+ node_image: "{{ openstack_image }}"
+ infra_image: "{{ openstack_image }}"
+ dns_image: "{{ openstack_image }}"
+ etcd_flavor: "{{ etcd_flavor }}"
+ master_flavor: "{{ master_flavor }}"
+ node_flavor: "{{ node_flavor }}"
+ infra_flavor: "{{ infra_flavor }}"
+ dns_flavor: "{{ dns_flavor }}"
--
cgit v1.2.3
From 3bf8df1a873785a09bf3c1827bfb5097955c5e44 Mon Sep 17 00:00:00 2001
From: Eric Sauer <etsauer@gmail.com>
Date: Tue, 7 Feb 2017 01:12:58 -0500
Subject: Fixing two significant bugs in the HEAT deployment (#13)
---
roles/openstack-stack/tasks/main.yml | 3 +++
1 file changed, 3 insertions(+)
(limited to 'roles/openstack-stack/tasks')
diff --git a/roles/openstack-stack/tasks/main.yml b/roles/openstack-stack/tasks/main.yml
index c953cb603..efee08c0e 100644
--- a/roles/openstack-stack/tasks/main.yml
+++ b/roles/openstack-stack/tasks/main.yml
@@ -29,3 +29,6 @@
node_flavor: "{{ node_flavor }}"
infra_flavor: "{{ infra_flavor }}"
dns_flavor: "{{ dns_flavor }}"
+ master_volume_size: "{{ master_volume_size }}"
+ app_volume_size: "{{ app_volume_size }}"
+ infra_volume_size: "{{ infra_volume_size }}"
--
cgit v1.2.3
From c90d5323afc575246df2f50e9125069f3c12e81e Mon Sep 17 00:00:00 2001
From: Eric Sauer <etsauer@gmail.com>
Date: Tue, 25 Apr 2017 23:17:38 -0400
Subject: Stack refactor (#38)
* Refactored openstack-stack role to:
- Convert static heat template files to ansible templates
- Include native ansible groups via openstack metadata. This removes the need for a playbook to map host groups
- Some code cleanup
* Deleting commentd out code and irrelevant plays
* Refactored openstack-stack role to:
- Convert static heat template files to ansible templates
- Include native ansible groups via openstack metadata. This removes the need for a playbook to map host groups
- Some code cleanup
* Deleting commentd out code and irrelevant plays
* Replacing stack parameters with jinja expressions
* Updating sample inventory to work with latest dynamic inventory changes
* updating inventory with host group mapping. making sync keys optional
* Missing cluster_hosts group
* Updating to add infra_hosts
* Updating inventory per comments from oybed and sabre1041
---
roles/openstack-stack/tasks/main.yml | 59 ++++++++++++++++++++----------------
1 file changed, 33 insertions(+), 26 deletions(-)
(limited to 'roles/openstack-stack/tasks')
diff --git a/roles/openstack-stack/tasks/main.yml b/roles/openstack-stack/tasks/main.yml
index efee08c0e..71c7bbe0d 100644
--- a/roles/openstack-stack/tasks/main.yml
+++ b/roles/openstack-stack/tasks/main.yml
@@ -1,34 +1,41 @@
---
+- name: create HOT stack template prefix
+ register: stack_template_pre
+ tempfile:
+ state: directory
+ prefix: casl-ansible
+
+- name: set template paths
+ set_fact:
+ stack_template_path: "{{ stack_template_pre.path }}/stack.yaml"
+ server_template_path: "{{ stack_template_pre.path }}/server.yaml"
+ user_data_template_path: "{{ stack_template_pre.path }}/user-data"
+
+- name: generate HOT stack template from jinja2 template
+ template:
+ src: heat_stack.yaml.j2
+ dest: "{{ stack_template_path }}"
+
+- name: generate HOT server template from jinja2 template
+ template:
+ src: heat_stack_server.yaml.j2
+ dest: "{{ server_template_path }}"
+
+- name: generate user_data from jinja2 template
+ template:
+ src: user_data.j2
+ dest: "{{ user_data_template_path }}"
+
- name: create stack
ignore_errors: False
register: stack_create
os_stack:
name: "{{ stack_name }}"
state: present
- template: 'roles/openstack-stack/files/heat_stack.yaml'
+ template: "{{ stack_template_path }}"
wait: yes
- parameters:
- cluster_env: "{{ dns_domain }}"
- cluster_id: "{{ stack_name }}"
- subnet_24_prefix: "{{ subnet_prefix }}"
- dns_nameservers: "{{ dns_nameservers }}"
- external_net: "{{ external_network }}"
- ssh_public_key: "{{ ssh_public_key }}"
- num_etcd: "{{ num_etcd }}"
- num_masters: "{{ num_masters }}"
- num_nodes: "{{ num_nodes }}"
- num_infra: "{{ num_infra }}"
- num_dns: "{{ num_dns }}"
- etcd_image: "{{ openstack_image }}"
- master_image: "{{ openstack_image }}"
- node_image: "{{ openstack_image }}"
- infra_image: "{{ openstack_image }}"
- dns_image: "{{ openstack_image }}"
- etcd_flavor: "{{ etcd_flavor }}"
- master_flavor: "{{ master_flavor }}"
- node_flavor: "{{ node_flavor }}"
- infra_flavor: "{{ infra_flavor }}"
- dns_flavor: "{{ dns_flavor }}"
- master_volume_size: "{{ master_volume_size }}"
- app_volume_size: "{{ app_volume_size }}"
- infra_volume_size: "{{ infra_volume_size }}"
+
+- name: cleanup temp files
+ file:
+ path: "{{ stack_template_pre.path }}"
+ state: absent
--
cgit v1.2.3