summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-29 13:38:37 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-29 13:38:37 -0400
commitada49b7eccf7fd96e5d4716ffd666987ad63be45 (patch)
tree525deee94e5a7506dbea7ea3a6e866873dfba0dd /playbooks/openstack
parent72f295fc7cdef47bffbdffa35b263e120ac9ad93 (diff)
parent638aae76fe3e2ce367dbf5901169b509feb181df (diff)
downloadopenshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.gz
openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.bz2
openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.xz
openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.zip
Merge pull request #1843 from detiber/remove_deprecated_roles
Remove deprecated roles
Diffstat (limited to 'playbooks/openstack')
-rw-r--r--playbooks/openstack/openshift-cluster/launch.yml4
-rw-r--r--playbooks/openstack/openshift-cluster/vars.yml4
2 files changed, 0 insertions, 8 deletions
diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml
index b6add9e86..3d4fe42d0 100644
--- a/playbooks/openstack/openshift-cluster/launch.yml
+++ b/playbooks/openstack/openshift-cluster/launch.yml
@@ -7,10 +7,6 @@
vars_files:
- vars.yml
tasks:
- - fail:
- msg: "Deployment type not supported for OpenStack provider yet"
- when: deployment_type == 'online'
-
# TODO: Write an Ansible module for dealing with HEAT stacks
# Dealing with the outputs is currently terrible
diff --git a/playbooks/openstack/openshift-cluster/vars.yml b/playbooks/openstack/openshift-cluster/vars.yml
index d45ab6b9e..84cba0506 100644
--- a/playbooks/openstack/openshift-cluster/vars.yml
+++ b/playbooks/openstack/openshift-cluster/vars.yml
@@ -28,10 +28,6 @@ deployment_vars:
image: "{{ lookup('oo_option', 'image_name') | default('centos-70-raw', True) }}"
ssh_user: openshift
become: yes
- online:
- image:
- ssh_user: root
- become: no
enterprise: "{{ deployment_rhel7_ent_base }}"
openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
atomic-enterprise: "{{ deployment_rhel7_ent_base }}"