Changed terraform.sample.yml to sample.yml, and terraform.yml to mant…

…l.yml

.travis.yml

@@ -1,9 +1,9 @@
 language: python
 env:
   matrix:
-     - TERRAFORM_FILE=testing/aws.tf ANSIBLE_PLAYBOOK=terraform.sample.yml
-     - TERRAFORM_FILE=testing/do.tf  ANSIBLE_PLAYBOOK=terraform.sample.yml
-     - TERRAFORM_FILE=testing/gce.tf ANSIBLE_PLAYBOOK=terraform.sample.yml
+     - TERRAFORM_FILE=testing/aws.tf ANSIBLE_PLAYBOOK=sample.yml
+     - TERRAFORM_FILE=testing/do.tf  ANSIBLE_PLAYBOOK=sample.yml
+     - TERRAFORM_FILE=testing/gce.tf ANSIBLE_PLAYBOOK=sample.yml
     # - TERRAFORM_FILE=testing/aws.tf ANSIBLE_PLAYBOOK=kubernetes.yml
     # - TERRAFORM_FILE=testing/do.tf  ANSIBLE_PLAYBOOK=kubernetes.yml
     # - TERRAFORM_FILE=testing/gce.tf ANSIBLE_PLAYBOOK=kubernetes.yml

Dockerfile

@@ -25,7 +25,7 @@ COPY . /mi/
 # load user custom setup
 ONBUILD COPY ssl/ /mi/ssl/
 ONBUILD COPY security.yml /mi/security.yml
-ONBUILD COPY terraform.yml /mi/terraform.yml
+ONBUILD COPY mantl.yml /mi/mantl.yml
 ONBUILD COPY *.tf /mi/
 
 RUN mkdir -p /state

Vagrantfile

@@ -16,7 +16,7 @@ config_hash = {
   "control_cpus" => 1,
   "edge_cpus" => 1,
   "network" => "private",
-  "playbooks" => ["/vagrant/terraform.sample.yml"]
+  "playbooks" => ["/vagrant/sample.yml"]
 }
 
 config_path = File.join(File.dirname(__FILE__), "vagrant-config.yml")

addons/glusterfs.yml

@@ -1,6 +1,5 @@
 ---
-# Gluster distributed storage. Run this playbook after running the core playbook
-# (terraform.sample.yml)
+# Gluster distributed storage. Run this playbook after mantl is up and running
 
 # CHECK SECURITY - when customizing you should leave this in. If you take it out
 # and forget to specify security.yml, security could be turned off on components

docker_launch.sh

@@ -18,4 +18,4 @@ fi
 terraform get
 terraform apply -state=$TERRAFORM_STATE_ROOT/terraform.tfstate
 ansible-playbook /mi/playbooks/wait-for-hosts.yml --private-key $SSH_KEY
-ansible-playbook /mi/terraform.yml --extra-vars=@security.yml --private-key $SSH_KEY
+ansible-playbook /mi/mantl.yml --extra-vars=@security.yml --private-key $SSH_KEY

docs/getting_started/dockerfile.rst

@@ -25,7 +25,7 @@ Setup
       aws.rst
 
 3. Finally, you need to create a custom ansible playbook for your cluster. You
-   can copy `terraform.sample.yml` to `terraform.yml` in your root directory to
+   can copy `sample.yml` to `mantl.yml` in your root directory to
    get started.
 
 Building a Docker Image

docs/getting_started/index.rst

@@ -67,7 +67,7 @@ inventory file, you can use the ``-i`` argument of ``ansible`` or
 
 .. code-block:: shell
 
-   ansible-playbook -i path/to/inventory -e @security.yml terraform.yml
+   ansible-playbook -i path/to/inventory -e @security.yml mantl.yml
 
 First, ping the servers to ensure they are reachable via ssh:
 
@@ -96,15 +96,15 @@ for verbose SSH debugging and try again to view the errors in more detail.
    more details.
 
 Next, deploy the software. First, you'll need to customize a playbook. A sample
-can be found at ``terraform.sample.yml`` in the root directory, you can find
+can be found at ``sample.yml`` in the root directory, you can find
 more about customizing this at :doc:`playbook`. The main change you'll want
 to make is changing ``consul_acl_datacenter`` to your preferred ACL datacenter.
 If you only have one datacenter, you can remove this variable. Next, assuming
-you've placed the filled-out template at ``terraform.yml``:
+you've placed the filled-out template at ``mantl.yml``:
 
 .. code-block:: shell
 
-  ansible-playbook -e @security.yml terraform.yml
+  ansible-playbook -e @security.yml mantl.yml
 
 The deployment will probably take a while as all tasks are completed.
 

docs/getting_started/playbook.rst

@@ -1,12 +1,12 @@
 Custom Playbook
 ===============
 
-Your customized ``terraform.yml`` `playbook`_ should be used to deploy
+Your customized ``mantl.yml`` `playbook`_ should be used to deploy
 Mantl to your servers.
 
 Below is an annotated playbook explaining the values:
 
-.. literalinclude:: ../../terraform.sample.yml
+.. literalinclude:: ../../sample.yml
    :language: yaml+jinja
 
 Run this playbook with ``ansible-playbook -i plugins/inventory/terraform.py -e

docs/upgrading/index.rst

@@ -53,7 +53,7 @@ Prior to 1.0, the ansible ``consul_dns_domain`` variable was defined in a number
 of different playbooks. It is now included in ``security.yml`` and can be
 customized from a single location. This simplifies the configuration and reduces
 the likelihood of mistakes. If you are working with a customized
-``terraform.yml`` file, you should remove all ``consul_dns_domain`` definitions
+``mantl.yml`` file, you should remove all ``consul_dns_domain`` definitions
 from it and ensure ``consul_dns_domain`` is set as desired in your
 ``security.yml``.
 
@@ -75,4 +75,4 @@ standard provisioning playbook:
 
 .. code-block:: shell
 
-  ansible-playbook -e @security.yml terraform.yml
+  ansible-playbook -e @security.yml mantl.yml

packer/vagrant.json

@@ -24,7 +24,7 @@
 	},
         {
             "type": "ansible-local",
-            "playbook_file": "{{pwd}}/terraform.sample.yml",
+            "playbook_file": "{{pwd}}/sample.yml",
             "role_paths": [
                 "{{pwd}}/roles/calico",
                 "{{pwd}}/roles/chronos",

requirements.txt

@@ -1,5 +1,5 @@
 alabaster==0.6.3
-# Change concurrently with the required ansible version in terraform.sample.yml
+# Change concurrently with the required ansible version in sample.yml
 ansible>=1.9.1,<2
 pytest==2.7.1
 PyYAML==3.11

roles/calico/README.rst

@@ -12,7 +12,7 @@ container on each worker node and managed by systemd. Any workload managed by
 Calico is registered as a service in Consul.
 
 Calico is not enabled by default. In order to run Calico, you should make a
-couple of changes to your ``terraform.yml``. You will need to add the ``etcd``
+couple of changes to your ``mantl.yml``. You will need to add the ``etcd``
 role into the ``roles`` section for ``all`` hosts:
 
 .. code-block:: json

roles/glusterfs/README.rst

@@ -12,7 +12,7 @@ Installation
 ------------
 
 As of 0.5.1, GlusterFS is distributed as an addon for Mantl. After a successful
-initial run (from your customized ``terraform.sample.yml``), install it with
+initial run (from your customized ``sample.yml``), install it with
 ``ansible-playbook -e @security.yml addons/glusterfs.yml``.
 
 Restarting

roles/traefik/README.rst

@@ -18,7 +18,7 @@ Migrating from haproxy
 
 In 0.5, this role replaces haproxy. To migrate, set ``traefik_marathon_domain``
 to whatever was previously the value of ``haproxy_domain`` and make sure your
-customized config has the new role from ``terraform.sample.yml``.
+customized config has the new role from ``sample.yml``.
 
 Variables
 ---------

testing/build-cluster.py

@@ -53,7 +53,7 @@ def run_cmds(cmds, fail_sequential=False):
         (["terraform", "apply"], 1),
         (ap + ["playbooks/wait-for-hosts.yml"], 3),
         (ap + ["-e", "serial=0", "playbooks/upgrade-packages.yml"], 1),
-        (ap + ["terraform.yml"], 1),
+        (ap + ["sample.yml"], 1),
         (["python2", "testing/healthchecks.py"], 2)
     ]
     debug = []

vagrant/README.rst

@@ -8,7 +8,7 @@ lightweight, reproducible, and portable development environments." We use it
 to test Mantl locally before deploying to a cloud provider.
 Our current setup creates a configurable number of virtual machines, and you can
 define how many you want to build using a configuration file as described below.
-One of the control servers provisions the others using the terraform.sample.yml
+One of the control servers provisions the others using the sample.yml
 playbook.
 
 Getting Started
@@ -56,7 +56,7 @@ in the provided Vagrantfile.
    For example, to attempt to run the GlusterFS addon
    (``./addons/glusterfs.yml``), you would add a
    ``/vagrant/addons/glusterfs.yml`` entry. You can also use this directive to
-   run playbooks other than ``terraform.sample.yml`` after provisioning for the
+   run playbooks other than ``sample.yml`` after provisioning for the
    first time, by modifying this variable and running ``vagrant provision``.
 
 Limitations