From 0fd0de17d44830d637cd3911cf06d2b5e7ad583e Mon Sep 17 00:00:00 2001 From: Dan Guido Date: Tue, 16 Aug 2016 00:00:26 -0400 Subject: [PATCH] rename the cloud roles --- algo | 15 ++++++--------- azure.yml | 2 +- digitalocean.yml | 2 +- ec2.yml | 2 +- google_cloud.yml => gce.yml | 2 +- roles/{azure => cloud-azure}/handlers/main.yml | 0 roles/{azure => cloud-azure}/tasks/main.yml | 0 .../handlers/main.yml | 0 .../tasks/main.yml | 0 .../templates/20-ipv6.cfg.j2 | 0 roles/{ec2 => cloud-ec2}/handlers/main.yml | 0 roles/{ec2 => cloud-ec2}/tasks/main.yml | 0 .../{google_cloud => cloud-gce}/handlers/main.yml | 0 roles/{google_cloud => cloud-gce}/tasks/main.yml | 0 14 files changed, 10 insertions(+), 13 deletions(-) rename google_cloud.yml => gce.yml (99%) rename roles/{azure => cloud-azure}/handlers/main.yml (100%) rename roles/{azure => cloud-azure}/tasks/main.yml (100%) rename roles/{digitalocean => cloud-digitalocean}/handlers/main.yml (100%) rename roles/{digitalocean => cloud-digitalocean}/tasks/main.yml (100%) rename roles/{digitalocean => cloud-digitalocean}/templates/20-ipv6.cfg.j2 (100%) rename roles/{ec2 => cloud-ec2}/handlers/main.yml (100%) rename roles/{ec2 => cloud-ec2}/tasks/main.yml (100%) rename roles/{google_cloud => cloud-gce}/handlers/main.yml (100%) rename roles/{google_cloud => cloud-gce}/tasks/main.yml (100%) diff --git a/algo b/algo index 8e1c48e..326b367 100755 --- a/algo +++ b/algo @@ -13,8 +13,8 @@ algo_provisioning () { What provider would you like to use? 1. DigitalOcean 2. Amazon EC2 - 3. Google-cloud - 0. Local installation (non-cloud or a server already deployed) + 3. Google Cloud Engine + 4. Remote installation (install to existing Ubuntu server) Enter the number of your desired provider : " @@ -22,12 +22,12 @@ Enter the number of your desired provider read N case "$N" in - 1) CLOUD="digitalocean" ;; + 1) CLOUD="digitalocean" ;; 2) CLOUD="ec2" ;; - 3) CLOUD="google_cloud" ;; - 0) CLOUD="non-cloud" ;; + 3) CLOUD="gce" ;; + 4) CLOUD="non-cloud" ;; *) exit 1 ;; - esac + esac p12_export_password @@ -43,6 +43,3 @@ case "$1" in update-users) user_management ;; *) algo_provisioning ;; esac - - - diff --git a/azure.yml b/azure.yml index 06098fb..11be810 100644 --- a/azure.yml +++ b/azure.yml @@ -71,7 +71,7 @@ #private: no roles: - - azure + - cloud-azure - name: Post-provisioning tasks hosts: vpn-host diff --git a/digitalocean.yml b/digitalocean.yml index e82d394..f59dde8 100644 --- a/digitalocean.yml +++ b/digitalocean.yml @@ -58,7 +58,7 @@ private: no roles: - - digitalocean + - cloud-digitalocean - name: Post-provisioning tasks hosts: vpn-host diff --git a/ec2.yml b/ec2.yml index 0a11e48..11f5f7e 100644 --- a/ec2.yml +++ b/ec2.yml @@ -67,7 +67,7 @@ private: no roles: - - ec2 + - cloud-ec2 - name: Post-provisioning tasks hosts: vpn-host diff --git a/google_cloud.yml b/gce.yml similarity index 99% rename from google_cloud.yml rename to gce.yml index d1cd9d4..9bd577c 100644 --- a/google_cloud.yml +++ b/gce.yml @@ -63,7 +63,7 @@ private: no roles: - - google_cloud + - cloud-gce - name: Post-provisioning tasks hosts: vpn-host diff --git a/roles/azure/handlers/main.yml b/roles/cloud-azure/handlers/main.yml similarity index 100% rename from roles/azure/handlers/main.yml rename to roles/cloud-azure/handlers/main.yml diff --git a/roles/azure/tasks/main.yml b/roles/cloud-azure/tasks/main.yml similarity index 100% rename from roles/azure/tasks/main.yml rename to roles/cloud-azure/tasks/main.yml diff --git a/roles/digitalocean/handlers/main.yml b/roles/cloud-digitalocean/handlers/main.yml similarity index 100% rename from roles/digitalocean/handlers/main.yml rename to roles/cloud-digitalocean/handlers/main.yml diff --git a/roles/digitalocean/tasks/main.yml b/roles/cloud-digitalocean/tasks/main.yml similarity index 100% rename from roles/digitalocean/tasks/main.yml rename to roles/cloud-digitalocean/tasks/main.yml diff --git a/roles/digitalocean/templates/20-ipv6.cfg.j2 b/roles/cloud-digitalocean/templates/20-ipv6.cfg.j2 similarity index 100% rename from roles/digitalocean/templates/20-ipv6.cfg.j2 rename to roles/cloud-digitalocean/templates/20-ipv6.cfg.j2 diff --git a/roles/ec2/handlers/main.yml b/roles/cloud-ec2/handlers/main.yml similarity index 100% rename from roles/ec2/handlers/main.yml rename to roles/cloud-ec2/handlers/main.yml diff --git a/roles/ec2/tasks/main.yml b/roles/cloud-ec2/tasks/main.yml similarity index 100% rename from roles/ec2/tasks/main.yml rename to roles/cloud-ec2/tasks/main.yml diff --git a/roles/google_cloud/handlers/main.yml b/roles/cloud-gce/handlers/main.yml similarity index 100% rename from roles/google_cloud/handlers/main.yml rename to roles/cloud-gce/handlers/main.yml diff --git a/roles/google_cloud/tasks/main.yml b/roles/cloud-gce/tasks/main.yml similarity index 100% rename from roles/google_cloud/tasks/main.yml rename to roles/cloud-gce/tasks/main.yml