update centos repo gpgkey for rhel gpu vulkan-filesystem install

README.md

@@ -70,8 +70,9 @@ dcos_legacy_node_type_name=slave_public
 
 ```yml
 dcos:
-  download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh"
-  version: "1.13.3"
+  download: "https://downloads.dcos.io/dcos/stable/1.13.4/dcos_generate_config.sh"
+  download_checksum: "sha256:a3d295de33ad55b10f5dc66c9594d9175a40f5aaec7734d664493968a9f751fd"
+  version: "1.13.4"
   enterprise_dcos: false
   selinux_mode: enforcing
 
@@ -90,6 +91,7 @@ dcos:
 | Name                    | Required?    | Description                                                                                                                                                                                                                                        |
 |:------------------------|:-------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | download                | REQUIRED     | (https) URL to download the Mesosphere DC/OS install from                                                                                                                                                                                          |
+| download_checksum       | no           | Checksum to check the download against. It should start with the method being used. E.g. "sha256:<checksum>"
 | version                 | REQUIRED     | Version string that reflects the version that the installer (given by `download`) installs. Can be collected by running `dcos_generate_config.sh --version`.                                                                                       |
 | version_to_upgrade_from | for upgrades | Version string of Mesosphere DC/OS the upgrade procedure expectes to upgrade FROM. A per-version upgrade script will be generated on the bootstrap machine, each cluster node downloads the proper upgrade for its currenly running DC/OS version. |
 | image_commit            | no           | Can be used to force same version / same config upgrades. Mostly useful for deploying/upgrading non-released versions, e.g. `1.12-dev`. This parameter takes precedence over `version`.                                                            |

ansible.cfg

@@ -3,8 +3,8 @@ inventory = inventory
 host_key_checking = False
 remote_user = centos
 forks = 100
-hash_behaviour = replace
+hash_behaviour = merge
 [ssh_connection]
 control_path = %(directory)s/%%C
 pipelining = True
-ssh_args = -o PreferredAuthentications=publickey -o ControlMaster=auto -o ControlPersist=5m -o IdentitiesOnly=yes -o PasswordAuthentication=no -o ConnectTimeout=320
+ssh_args = -o PreferredAuthentications=publickey -o ControlMaster=auto -o ControlPersist=5m

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: dcos
 name: cluster
-version: 0.56.0
+version: 0.58.0
 readme: README.md
 description: Ansible roles to manage a Mesosphere DC/OS clusters lifecycle
 authors:

group_vars/all/dcos-ee.yaml.example

@@ -0,0 +1,28 @@
+---
+dcos:
+  download: "https://downloads.mesosphere.com/dcos-enterprise/stable/2.0.1/dcos_generate_config.ee.sh"
+  download_checksum: "sha256:b41ed2fbb5e82562c6c666777054b24a563fedfccf604b6a4b44f5ee2af464a7"
+  download_win: "https://downloads.mesosphere.com/dcos-enterprise/testing/master/windows/dcos_generate_config_win.ee.sh"
+  version: "2.0.1"
+  enterprise_dcos: true
+
+  selinux_mode: permissive
+
+  config:
+    # This is a direct yaml representation of the DC/OS config.yaml
+    # Please see https://docs.mesosphere.com/1.13/installing/production/advanced-configuration/configuration-reference/
+    # for parameter reference.
+    cluster_name: "examplecluster"
+    license_key_contents: "<REPLACE WITH VALID LICENSE>"
+    security: strict
+    bootstrap_url: http://int-bootstrap1-examplecluster.example.com:8080
+    exhibitor_storage_backend: static
+    master_discovery: static
+    master_list:
+      - 172.31.2.95
+    # This is an ip-detect script example which also stands for ip_detect_public_contents
+    # more info about ip-detect can be found here: https://docs.mesosphere.com/1.13/installing/production/deploying-dcos/installation/#create-an-ip-detection-script
+    # ip_detect_contents: |
+    #   #!/bin/sh
+    #   set -o nounset -o errexit
+    #   ip addr show dev eth1 primary | awk '/(inet .*\/)/ { print $2 }' | cut -d'/' -f1

group_vars/all/dcos.yaml.example

@@ -1,7 +1,9 @@
 ---
 dcos:
-  download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh"
-  version: "1.13.3"
+  download: "https://downloads.dcos.io/dcos/stable/2.0.1/dcos_generate_config.sh"
+  download_checksum: "sha256:4c23098d14ca7920062114def614f2d60d3f76ab5f59783ddfb713aa96718ed8"
+  download_win: "https://downloads.dcos.io/dcos/testing/master/windows/dcos_generate_config_win.sh"
+  version: "2.0.1"
   enterprise_dcos: false
 
   selinux_mode: permissive

molecule/default/idempotence.yml

@@ -11,9 +11,6 @@
         name: dcos_bootstrap
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh"
-      version: "1.13.3"
-      version_to_upgrade_from: "1.13.3"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]
@@ -28,9 +25,6 @@
         name: dcos_master
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh"
-      version: "1.13.3"
-      version_to_upgrade_from: "1.13.3"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]
@@ -44,9 +38,6 @@
         name: dcos_agent
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh"
-      version: "1.13.3"
-      version_to_upgrade_from: "1.13.3"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]

molecule/ec2/create.yml

@@ -7,19 +7,21 @@
   vars:
     ssh_user: ec2-user
     ssh_port: 22
+    spot_price_max_calc: 5
 
-    security_group_name: molecule
+    admin_ip: "{{ lookup('url', 'http://whatismyip.akamai.com') }}"
+    security_group_name: "molecule_{{ lookup('env', 'HOSTNAME') | default(lookup('env', 'USER') | to_uuid, true) }}"
     security_group_description: Security group for testing Molecule
     security_group_rules:
       - proto: tcp
         from_port: "{{ ssh_port }}"
         to_port: "{{ ssh_port }}"
-        cidr_ip: "0.0.0.0/0"
+        cidr_ip: "{{ admin_ip }}/32"
       - proto: icmp
         from_port: 8
         to_port: -1
-        cidr_ip: "0.0.0.0/0"
-      - proto: tcp
+        cidr_ip: "{{ admin_ip }}/32"
+      - proto: all
         from_port: 0
         to_port: 65535
         cidr_ip: "172.31.0.0/16"
@@ -29,7 +31,7 @@
         to_port: 0
         cidr_ip: "0.0.0.0/0"
 
-    keypair_name: molecule_key
+    keypair_name: "molecule_key_{{ lookup('env', 'HOSTNAME') | default(lookup('env', 'USER') | to_uuid, true) }}"
     keypair_path: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/ssh_key"
   tasks:
     - debug:
@@ -40,53 +42,39 @@
         description: "{{ security_group_name }}"
         rules: "{{ security_group_rules }}"
         rules_egress: "{{ security_group_rules_egress }}"
-        region: "{{ item.region }}"
-      with_items: "{{ molecule_yml.platforms }}"
-
-    - name: Test for presence of local keypair
-      stat:
-        path: "{{ keypair_path }}"
-      register: keypair_local
+        region: "{{ molecule_yml.platforms[0].region }}"
+      register: security_group
 
-    - name: Delete remote keypair
+    - name: Create keypair
       ec2_key:
         name: "{{ keypair_name }}"
-        state: absent
-        region: "{{ item.region }}"
-      with_items: "{{ molecule_yml.platforms }}"
-      when: not keypair_local.stat.exists
+        region: "{{ molecule_yml.platforms[0].region }}"
+      register: keypair
 
-    - name: Create keypairs
-      ec2_key:
-        name: "{{ keypair_name }}"
-        region: "{{ item.region }}"
-      with_items: "{{ molecule_yml.platforms }}"
-      register: keypairs
-
-    - name: Persist the keypairs
-      blockinfile:
-        path: "{{ keypair_path }}"
-        create: yes
-        state: present
-        block: "{{ item.key.private_key }}"
+    - name: Persist the keypair
+      copy:
+        dest: "{{ keypair_path }}"
+        content: "{{ keypair.key.private_key }}"
         mode: 0600
-      when: item.changed
-      with_items: "{{ keypairs.results }}"
+      when: keypair.changed
 
     - name: Create molecule instance(s)
       ec2:
         key_name: "{{ keypair_name }}"
         image: "{{ item.image }}"
         region: "{{ item.region }}"
+        zone: "{{ item.zone|default(omit) }}"
+        instance_initiated_shutdown_behavior: terminate
         instance_type: "{{ item.instance_type }}"
+        spot_price: "{{ item.spot_price | ternary(item.spot_price, omit) if item.spot_price is defined else spot_price_max_calc }}"
         group: "{{ security_group_name }}"
         volumes:
           - device_name: /dev/sda1
             volume_size: 20
             volume_type: gp2
             delete_on_termination: yes
         instance_tags:
-          Name: "molecule {{ item.name }} {{ lookup('env', 'USER') | default('ci', true) }}@{{ lookup('env', 'HOSTNAME') | default((lookup('env', 'USER') + lookup('pipe', 'date +%Y-%m-%d-%H-%M-%S')) | to_uuid, true) }}"
+          Name: "molecule {{ item.name }}"
           instance: "{{ item.name }}"
           molecule_region: "{{ item.region }}"
           molecule_ssh_user: "{{ item.ssh_user | default(ssh_user) }}"
@@ -95,7 +83,9 @@
         count_tag:
           instance: "{{ item.name }}"
       register: server
-      with_items: "{{ molecule_yml.platforms }}"
+      loop: "{{ molecule_yml.platforms }}"
+      loop_control:
+        index_var: index
       async: 7200
       poll: 0
 
@@ -121,7 +111,7 @@
             "identity_file": "{{ keypair_path }}",
             "instance_ids": "{{ item.instance_ids }}",
           }
-      with_items: "{{ ec2_jobs.results | default(server.results) }}"
+      with_items: "{{ ec2_jobs.results }}"
       register: instance_config_dict
       when: server.changed | bool
 
@@ -147,4 +137,4 @@
 
     - name: Wait for boot process to finish
       pause:
-        seconds: 42
+        seconds: 2

molecule/ec2/destroy.yml

@@ -4,45 +4,59 @@
   connection: local
   gather_facts: false
   no_log: "{{ not (lookup('env', 'MOLECULE_DEBUG') | bool or molecule_yml.provisioner.log|default(false) | bool) }}"
+  vars:
+    security_group_name: "molecule_{{ lookup('env', 'HOSTNAME') | default(lookup('env', 'USER') | to_uuid, true) }}"
+    keypair_name: "molecule_key_{{ lookup('env', 'HOSTNAME') | default(lookup('env', 'USER') | to_uuid, true) }}"
   tasks:
-    - block:
-        - name: Populate instance config
-          set_fact:
-            instance_conf: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
-            skip_instances: false
-      rescue:
-        - name: Populate instance config when file missing
-          set_fact:
-            instance_conf: {}
-            skip_instances: true
-
-    - name: Destroy molecule instance(s)
+    - name: "check if {{ molecule_instance_config }} file exists"
+      stat:
+        path: "{{ molecule_instance_config }}"
+      register: molecule_instance_config_stat
+
+    - name: Populate instance config
+      set_fact:
+        instance_conf: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
+        skip_instances: false
+      when: molecule_instance_config_stat.stat.exists
+
+    - name: Populate instance config when file missing
+      set_fact:
+        instance_conf: {}
+        skip_instances: true
+      when: not molecule_instance_config_stat.stat.exists
+
+    - name: Destroy molecule instances
       ec2:
         state: absent
         instance_ids: "{{ item.instance_ids }}"
         region: "{{ item.region }}"
+        wait: true
+        wait_timeout: 600
       register: server
       with_items: "{{ instance_conf }}"
       when: not skip_instances
-      async: 7200
-      poll: 0
 
-    - name: Wait for instance(s) deletion to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: ec2_jobs
-      until: ec2_jobs.finished
-      retries: 300
-      with_items: "{{ server.results }}"
+    - name: Delete remote keypair
+      ec2_key:
+        name: "{{ keypair_name }}"
+        state: absent
+        region: "{{ molecule_yml.platforms[0].region }}"
+
+    - name: Destroy molecule security_group
+      ec2_group:
+        name: "{{ security_group_name }}"
+        state: absent
+        region: "{{ molecule_yml.platforms[0].region }}"
 
     # Mandatory configuration for Molecule to function.
 
     - name: Populate instance config
       set_fact:
         instance_conf: {}
+      register: clear_config
 
     - name: Dump instance config
       copy:
         content: "{{ instance_conf | to_json | from_json | molecule_to_yaml | molecule_header }}"
         dest: "{{ molecule_instance_config }}"
-      when: server.changed | bool
+      when: clear_config