From f843cc5996895f3380cffa93707becaa43fbb577 Mon Sep 17 00:00:00 2001 From: Sebastian Brandt <793580+sebbrandt87@users.noreply.github.com> Date: Wed, 31 Jul 2019 21:58:35 +0200 Subject: [PATCH] all versions to 1.13.3, ansible security fix --- Dockerfile | 2 +- README.md | 4 ++-- galaxy.yml | 23 +++++++++++++++++-- group_vars/all/dcos.yaml.example | 4 ++-- molecule/default/idempotence.yml | 18 +++++++-------- molecule/ec2/install_and_upgrade.yml | 12 +++++----- molecule/ec2/same_version_config_update.yml | 18 +++++++-------- .../install_1-13_upgrade_1-13.yml | 18 +++++++-------- .../same_version_config_update_1-13.yml | 18 +++++++-------- .../bootstrap_need_prereqs/molecule.yml | 4 ++-- .../tests/test_default.py | 2 +- test_requirements.txt | 2 +- 12 files changed, 72 insertions(+), 53 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2615e419..e2d9af99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.7-slim RUN apt update && apt install -y --no-install-recommends openssh-client && rm -rf /var/lib/apt/lists/* -RUN pip install ansible==2.7.8 jmespath +RUN pip install ansible==2.7.12 jmespath COPY dcos.yml /dcos_playbook.yml COPY roles /roles COPY ansible.cfg /ansible.cfg diff --git a/README.md b/README.md index 7abf3e12..e85c3caa 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,8 @@ dcos_legacy_node_type_name=slave_public ```yml dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" + download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh" + version: "1.13.3" enterprise_dcos: false selinux_mode: enforcing diff --git a/galaxy.yml b/galaxy.yml index 57859dbb..8804e9b1 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,8 +1,27 @@ --- namespace: dcos -name: dcos_ansible -version: 0.54.0 +name: cluster +version: 0.55.0 readme: README.md +description: Ansible roles to manage a Mesosphere DC/OS clusters lifecycle +authors: + - jrx + - rimusz + - fatz + - sebbrandt87 + - bernadinm + - geekbass + - yankcrime + - victhar + - sbaier1 + - muconsulting + - matt2000 + - linben + - keith-mcclellan + - driabich + - aayvazyan + - The-Loeki + - MrMarvin license: - Apache-2.0 tags: diff --git a/group_vars/all/dcos.yaml.example b/group_vars/all/dcos.yaml.example index da817e3f..f6246709 100755 --- a/group_vars/all/dcos.yaml.example +++ b/group_vars/all/dcos.yaml.example @@ -1,7 +1,7 @@ --- dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" + download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh" + version: "1.13.3" enterprise_dcos: false selinux_mode: permissive diff --git a/molecule/default/idempotence.yml b/molecule/default/idempotence.yml index 35b91fb5..b27cb6ae 100644 --- a/molecule/default/idempotence.yml +++ b/molecule/default/idempotence.yml @@ -11,9 +11,9 @@ name: DCOS.bootstrap vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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 +28,9 @@ name: DCOS.master vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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 +44,9 @@ name: DCOS.agent vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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 }}"] diff --git a/molecule/ec2/install_and_upgrade.yml b/molecule/ec2/install_and_upgrade.yml index f770ef04..354b6076 100644 --- a/molecule/ec2/install_and_upgrade.yml +++ b/molecule/ec2/install_and_upgrade.yml @@ -59,8 +59,8 @@ name: DCOS.bootstrap vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" + download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh" + version: "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 }}"] @@ -74,8 +74,8 @@ name: DCOS.master vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" + download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh" + version: "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 }}"] @@ -88,8 +88,8 @@ name: DCOS.agent vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" + download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh" + version: "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 }}"] diff --git a/molecule/ec2/same_version_config_update.yml b/molecule/ec2/same_version_config_update.yml index 748a07d3..99f40c2b 100644 --- a/molecule/ec2/same_version_config_update.yml +++ b/molecule/ec2/same_version_config_update.yml @@ -13,9 +13,9 @@ name: DCOS.bootstrap vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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 }}"] @@ -30,9 +30,9 @@ name: DCOS.master vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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 }}"] @@ -46,9 +46,9 @@ name: DCOS.agent vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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 }}"] diff --git a/molecule/vagrant_centos7/install_1-13_upgrade_1-13.yml b/molecule/vagrant_centos7/install_1-13_upgrade_1-13.yml index 95034f6d..3ca7632b 100644 --- a/molecule/vagrant_centos7/install_1-13_upgrade_1-13.yml +++ b/molecule/vagrant_centos7/install_1-13_upgrade_1-13.yml @@ -58,9 +58,9 @@ name: DCOS.bootstrap vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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.eth1.ipv4.address }}:8080" master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"] @@ -74,9 +74,9 @@ name: DCOS.master vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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.eth1.ipv4.address }}:8080" master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"] @@ -89,9 +89,9 @@ name: DCOS.agent vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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.eth1.ipv4.address }}:8080" master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"] diff --git a/molecule/vagrant_centos7/same_version_config_update_1-13.yml b/molecule/vagrant_centos7/same_version_config_update_1-13.yml index 8f378eb2..0fe15629 100644 --- a/molecule/vagrant_centos7/same_version_config_update_1-13.yml +++ b/molecule/vagrant_centos7/same_version_config_update_1-13.yml @@ -13,9 +13,9 @@ name: DCOS.bootstrap vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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.eth1.ipv4.address }}:8080" master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"] @@ -30,9 +30,9 @@ name: DCOS.master vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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.eth1.ipv4.address }}:8080" master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"] @@ -46,9 +46,9 @@ name: DCOS.agent vars: dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" - version_to_upgrade_from: "1.13.2" + 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.eth1.ipv4.address }}:8080" master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"] diff --git a/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/molecule.yml b/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/molecule.yml index 9ec430f5..b2a89c79 100644 --- a/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/molecule.yml +++ b/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/molecule.yml @@ -22,8 +22,8 @@ provisioner: cluster_name_confirmed: true cluster_name: "moleculecentos75" dcos: - download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh" - version: "1.13.2" + download: "https://downloads.dcos.io/dcos/stable/1.13.3/dcos_generate_config.sh" + version: "1.13.3" enterprise_dcos: false selinux_mode: enforcing config: diff --git a/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/tests/test_default.py b/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/tests/test_default.py index 9ce87409..0d6cefcf 100644 --- a/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/tests/test_default.py +++ b/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/tests/test_default.py @@ -13,6 +13,6 @@ def test_docker_running_and_enabled(host): def test_docker_serves_bootstrap_files(host): # TODO: get nodes config in here somehow and make uri dynamic cmd = host.run( - "curl -I http://localhost:8080/1.13.2/genconf/serve/bootstrap.latest") + "curl -I http://localhost:8080/1.13.3/genconf/serve/bootstrap.latest") assert cmd.rc == 0 assert '200 OK' in cmd.stdout diff --git a/test_requirements.txt b/test_requirements.txt index 819ee6cd..b1b01d5d 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -4,5 +4,5 @@ molecule[vagrant] boto boto3 ansible-lint==4.1.0 -ansible==2.7.8 +ansible==2.7.12 yamllint==1.15.0