summaryrefslogtreecommitdiffstats
path: root/roles/openstack-stack/tasks
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-10-27 17:27:51 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-11-07 14:35:46 +1100
commit63fb0c74fcb0adf4cd3b0b2b5d30e34e29a58796 (patch)
tree59402c2bb8fb25ed194f08d9a6dccc8d40488d53 /roles/openstack-stack/tasks
parent4ed9aef6f8ed0850e70b498e780d0d8e22bc277f (diff)
downloadopenshift-63fb0c74fcb0adf4cd3b0b2b5d30e34e29a58796.tar.gz
openshift-63fb0c74fcb0adf4cd3b0b2b5d30e34e29a58796.tar.bz2
openshift-63fb0c74fcb0adf4cd3b0b2b5d30e34e29a58796.tar.xz
openshift-63fb0c74fcb0adf4cd3b0b2b5d30e34e29a58796.zip
Remove the extra roles
The `openstack-stack` role is now under `openshift_openstack` and the `openstack-create-cinder-registry` one will be added there, later.
Diffstat (limited to 'roles/openstack-stack/tasks')
-rw-r--r--roles/openstack-stack/tasks/cleanup.yml6
-rw-r--r--roles/openstack-stack/tasks/generate-templates.yml26
-rw-r--r--roles/openstack-stack/tasks/main.yml26
3 files changed, 0 insertions, 58 deletions
diff --git a/roles/openstack-stack/tasks/cleanup.yml b/roles/openstack-stack/tasks/cleanup.yml
deleted file mode 100644
index 258334a6b..000000000
--- a/roles/openstack-stack/tasks/cleanup.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-- name: cleanup temp files
- file:
- path: "{{ stack_template_pre.path }}"
- state: absent
diff --git a/roles/openstack-stack/tasks/generate-templates.yml b/roles/openstack-stack/tasks/generate-templates.yml
deleted file mode 100644
index 0ff50a095..000000000
--- a/roles/openstack-stack/tasks/generate-templates.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: create HOT stack template prefix
- register: stack_template_pre
- tempfile:
- state: directory
- prefix: openshift-ansible
-
-- name: set template paths
- set_fact:
- stack_template_path: "{{ stack_template_pre.path }}/stack.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: "{{ stack_template_pre.path }}/server.yaml"
-
-- name: generate user_data from jinja2 template
- template:
- src: user_data.j2
- dest: "{{ user_data_template_path }}"
diff --git a/roles/openstack-stack/tasks/main.yml b/roles/openstack-stack/tasks/main.yml
deleted file mode 100644
index 0348f53ce..000000000
--- a/roles/openstack-stack/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: Generate the templates
- include: generate-templates.yml
- when:
- - stack_state == 'present'
-
-- name: Handle the Stack (create/delete)
- ignore_errors: False
- register: stack_create
- os_stack:
- name: "{{ stack_name }}"
- state: "{{ stack_state }}"
- template: "{{ stack_template_path | default(omit) }}"
- wait: yes
-
-# NOTE(bogdando) OS::Neutron::Subnet doesn't support live updates for
-# dns_nameservers, so we can't do that for the "create stack" task.
-- include: subnet_update_dns_servers.yaml
- when:
- - private_dns_server is defined
- - stack_state == 'present'
-
-- name: CleanUp
- include: cleanup.yml
- when:
- - stack_state == 'present'