summaryrefslogtreecommitdiffstats
path: root/playbooks/gcp
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/gcp')
-rw-r--r--playbooks/gcp/openshift-cluster/provision.yml19
-rw-r--r--playbooks/gcp/provision.yml13
2 files changed, 13 insertions, 19 deletions
diff --git a/playbooks/gcp/openshift-cluster/provision.yml b/playbooks/gcp/openshift-cluster/provision.yml
deleted file mode 100644
index a3d1d46a6..000000000
--- a/playbooks/gcp/openshift-cluster/provision.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Ensure all cloud resources necessary for the cluster, including instances, have been started
- hosts: localhost
- connection: local
- gather_facts: no
- tasks:
-
- - name: provision a GCP cluster in the specified project
- include_role:
- name: openshift_gcp
-
-- name: normalize groups
- include: ../../byo/openshift-cluster/initialize_groups.yml
-
-- name: run the std_include
- include: ../../common/openshift-cluster/std_include.yml
-
-- name: run the config
- include: ../../common/openshift-cluster/config.yml
diff --git a/playbooks/gcp/provision.yml b/playbooks/gcp/provision.yml
new file mode 100644
index 000000000..b6edf9961
--- /dev/null
+++ b/playbooks/gcp/provision.yml
@@ -0,0 +1,13 @@
+---
+- name: Ensure all cloud resources necessary for the cluster, including instances, have been started
+ hosts: localhost
+ connection: local
+ gather_facts: no
+ tasks:
+
+ - name: provision a GCP cluster in the specified project
+ import_role:
+ name: openshift_gcp
+
+- name: run the cluster deploy
+ import_playbook: ../deploy_cluster.yml