change more occurences of slave

Capgemini · May 10, 2016 · 8c400ee · 8c400ee
1 parent 8d6d216
commit 8c400ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/docs/getting-started-guides/rackspace.md b/docs/getting-started-guides/rackspace.md
@@ -64,8 +64,8 @@ TF_VAR_key_name="apollo" (or another name of your choice for the ssh key assigne
 TF_VAR_public_key_file="~/.ssh/id_rsa_rs.pub" (the public ssh key to be uploaded to your Rackspace account and associated with your instances)
 TF_VAR_mesos_masters="3" (The number of Mesos Master nodes)
 TF_VAR_mesos_master_instance_type="general1-4" (The flavour of the Mesos Master instances)
-TF_VAR_mesos_slaves="1" (The number of Mesos Slave nodes)
-TF_VAR_mesos_slave_instance_type="general1-4" (The flavour of the Mesos Slave instances)
+TF_VAR_mesos_agents="1" (The number of Mesos Agent nodes)
+TF_VAR_mesos_agent_instance_type="general1-4" (The flavour of the Mesos Agent instances)
 TF_VAR_etcd_discovery_url_file="etcd_discovery_url.txt" (The name of the temp file which captures the discovery URL for the CoreOS etcd2 cloud config)
 ```
 
@@ -88,7 +88,7 @@ _NOTE: For non-Rackspace Openstack implemenations, networking resources can be c
 
 _NOTE: The script will provision a new environment (in Rackspace public cloud by default) and a 3 node mesos master cluster across all the availability zones in LON (London datacenter).
 
-It will also create a mesos slave cluster.
+It will also create a mesos agent cluster.
 
 It will then generate a dynamic Ansible inventory based on the Terraform state file and run an Ansible playbook to provision the cluster.
 

diff --git a/terraform/rackspace/main.tf b/terraform/rackspace/main.tf
@@ -9,6 +9,7 @@ variable "auth_url"  { default = "https://identity.api.rackspacecloud.com/v2.0"}
 
 # Image ids
 variable "coreos_stable_image" { default = "40155f16-21d4-4ac1-ad65-c409d94b8c7c" } # Defaults to Rackspcace CoreOS stable image id.
+variable "coreos_beta_image" {default = "6045cb80-52ed-4114-bf9a-7f15a36c65dc" } # Defaults to Rackspcace CoreOS beta image id.
 
 # ssh key variables
 variable "key_name"        { default = "apollo" } # The name of the ssh key to associate with Openstack instances.
@@ -27,7 +28,7 @@ variable "private_network_name"  { default = "ServiceNet"} # Default name for th
 variable "mesos_masters"              { default = "3" }
 variable "mesos_master_instance_type" { default = "general1-4" }
 variable "mesos_agents"               { default = "1" }
-variable "mesos_slave_instance_type"  { default = "general1-4" }
+variable "mesos_agent_instance_type"  { default = "general1-4" }
 
 # Etcd variables
 variable "etcd_discovery_url_file" { default = "etcd_discovery_url.txt"}
@@ -95,7 +96,7 @@ module "mesos-masters" {
 module "mesos-agents" {
   source                  = "./modules/mesos_agents"
   region                  = "${var.region}"
-  instance_type           = "${var.mesos_slave_instance_type}"
+  instance_type           = "${var.mesos_agent_instance_type}"
   image_id                = "${var.coreos_stable_image}"
   key_pair                = "${module.keypair.keypair_name}"
   public_network_id       = "${var.public_network_id}"
@@ -116,7 +117,7 @@ module "mesos-agents" {
 output "master_ips" {
   value = "${module.mesos-masters.master_ips}"
 }
-output "slave_ips" {
+output "agent_ips" {
   value = "${module.mesos-agents.agent_ips}"
 }
 # We need this for the open_urls function