Prepare version v0.5.0-dcos-1.10

mesosphere-backup · Dec 19, 2017 · 6925dde · 6925dde
1 parent 842f3e2
commit 6925dde
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.5.0-dcos-1.10
+
+* Installs and disables dnsmasq
+* Disables source/dest for AWS instances check in order to get CNI/Calico working properly
+* Tested with DC/OS 1.10.2
+* Migrated repo to https://github.com/dcos-labs/terraform-ansible-dcos
+
 ## v0.4.0-alpha
 
 * #5 Adds Dynamic Inventory to read from Terraform state

diff --git a/README.md b/README.md
@@ -16,14 +16,13 @@ Use `git tag` to list all versions:
 
 ```
 git tag
-v0.3.0-alpha
-v0.4.0-alpha
+v0.5.0-dcos-1.10
 ```
 
 Check out the latest version with:
 
 ```
-git checkout v0.4.0-alpha
+git checkout v0.5.0-dcos-1.10
 ```
 
 Here are some guides to follow to install the DC/OS cluster:

diff --git a/docs/UPGRADE.md b/docs/UPGRADE.md
@@ -1,9 +1,9 @@
 # Upgrade DC/OS
 
-In order to upgrade a cluster, you have to set the download URL for the target version of DC/OS inside of the file `group_vars/all`. So for example if you want to upgrade to DC/OS 1.10.0, specify the download URL for this version like this:
+In order to upgrade a cluster, you have to set the download URL for the target version of DC/OS inside of the file `group_vars/all`. So for example if you want to upgrade to DC/OS 1.10.2, specify the download URL for this version like this:
 
 ```
-dcos_download: https://downloads.dcos.io/dcos/stable/1.10.0/dcos_generate_config.sh
+dcos_download: https://downloads.dcos.io/dcos/stable/1.10.2/dcos_generate_config.sh
 ```
 
 To start the upgrade trigger the play `plays/upgrade.yml` and specify the DC/OS version that is currently running on the cluster as the variable `installed_cluster_version`. The command for that is:

diff --git a/group_vars/all.example b/group_vars/all.example
@@ -3,7 +3,7 @@
 cluster_name: demo
 
 # Download URL for DC/OS
-dcos_download: https://downloads.dcos.io/dcos/stable/1.10.0/dcos_generate_config.sh
+dcos_download: https://downloads.dcos.io/dcos/stable/1.10.2/dcos_generate_config.sh
 
 # Install latest operating system updates
 # options: true, false

diff --git a/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml
@@ -1,11 +1,7 @@
 ---
 # This playbook generates the DC/OS installation/configuration files
 
-<<<<<<< HEAD
 - name: make sure docker-python is not installed via yum
-=======
-- name: make sure docker-python RPM is not installed
->>>>>>> 6cb1a36887eb2a51f440599f7a0b0aa5cc1a5139
   yum:
     name: docker-python
     state: absent
@@ -20,20 +16,8 @@
     name: python-pip
     state: present
 
-<<<<<<< HEAD
 - name: make sure docker-py is installed via pip
   pip: name="docker-py==1.10.6" state=present
-=======
-- name: make sure required PyPi packages are installed
-  pip: name={{ item }} state=present
-  with_items:
-    - docker-py==1.10.6
-
-- name: stop web server
-  docker_container:
-    name: dcos_nginx
-    state: absent
->>>>>>> 6cb1a36887eb2a51f440599f7a0b0aa5cc1a5139
 
 - name: clear install directory
   file: path={{ path_bootstrap }} state=absent
@@ -90,10 +74,7 @@
     image: nginx
     state: started
     recreate: yes
-<<<<<<< HEAD
     restart: yes
-=======
->>>>>>> 6cb1a36887eb2a51f440599f7a0b0aa5cc1a5139
     ports:
     - "{{ port_webserver }}:80"
     volumes: