From 02aac355170f7757550611c855f5eab49e134db4 Mon Sep 17 00:00:00 2001 From: speedlight Date: Wed, 21 Nov 2018 10:59:59 -0500 Subject: [PATCH 1/7] package manager deprecation warnings --- lamp_simple/group_vars/all | 14 ++++++++++++++ lamp_simple/roles/db/tasks/main.yml | 9 +-------- lamp_simple/roles/web/tasks/install_httpd.yml | 11 +---------- lamp_simple/site.yml | 9 ++++++--- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/lamp_simple/group_vars/all b/lamp_simple/group_vars/all index 74ca4581c..4cc015329 100644 --- a/lamp_simple/group_vars/all +++ b/lamp_simple/group_vars/all @@ -4,3 +4,17 @@ httpd_port: 80 ntpserver: 192.168.1.2 repository: https://github.com/bennojoy/mywebapp.git + +db_packages: + - mysql-server + - MySQL-python + - libselinux-python + - libsemanage-python + +web_packages: + - httpd + - php + - php-mysql + - git + - libsemanage-python + - libselinux-python diff --git a/lamp_simple/roles/db/tasks/main.yml b/lamp_simple/roles/db/tasks/main.yml index 2afc4061c..e32c6b35c 100644 --- a/lamp_simple/roles/db/tasks/main.yml +++ b/lamp_simple/roles/db/tasks/main.yml @@ -2,14 +2,7 @@ # This playbook will install mysql and create db user and give permissions. - name: Install Mysql package - yum: - name: "{{ item }}" - state: installed - with_items: - - mysql-server - - MySQL-python - - libselinux-python - - libsemanage-python + yum: name={{ db_packages }} state=installed - name: Configure SELinux to start mysql on any port seboolean: diff --git a/lamp_simple/roles/web/tasks/install_httpd.yml b/lamp_simple/roles/web/tasks/install_httpd.yml index 4de593d95..b179c0e46 100644 --- a/lamp_simple/roles/web/tasks/install_httpd.yml +++ b/lamp_simple/roles/web/tasks/install_httpd.yml @@ -2,16 +2,7 @@ # These tasks install http and the php modules. - name: Install http and php etc - yum: - name: "{{ item }}" - state: present - with_items: - - httpd - - php - - php-mysql - - git - - libsemanage-python - - libselinux-python + yum: name={{ web_packages }} state=present - name: insert iptables rule for httpd lineinfile: diff --git a/lamp_simple/site.yml b/lamp_simple/site.yml index 44a74bf30..622d707bc 100644 --- a/lamp_simple/site.yml +++ b/lamp_simple/site.yml @@ -3,21 +3,24 @@ - name: apply common configuration to all nodes hosts: all - remote_user: root + become: yes + #remote_user: root roles: - common - name: configure and deploy the webservers and application code hosts: webservers - remote_user: root + become: yes + #remote_user: root roles: - web - name: deploy MySQL and configure the databases hosts: dbservers - remote_user: root + become: yes + #remote_user: root roles: - db From 9004ca94757ec93e995356a09c8620265df69b0c Mon Sep 17 00:00:00 2001 From: speedlight Date: Wed, 21 Nov 2018 11:17:11 -0500 Subject: [PATCH 2/7] yum deprectation warnings for wordpress_nginx playbook --- wordpress-nginx/group_vars/all | 18 ++++++++++++++++++ wordpress-nginx/roles/mysql/tasks/main.yml | 7 +------ wordpress-nginx/roles/php-fpm/tasks/main.yml | 13 +------------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/wordpress-nginx/group_vars/all b/wordpress-nginx/group_vars/all index 76c6155e9..592a1a0e2 100644 --- a/wordpress-nginx/group_vars/all +++ b/wordpress-nginx/group_vars/all @@ -24,3 +24,21 @@ auto_up_disable: false #false = Development, minor, and major updates are all disabled #minor = Minor updates are enabled, development, and major updates are disabled core_update_level: true + +db_packages: + - mysql-server + - MySQL-python + - libselinux-python + - libsemanage-python + +php_packages: + - php + - php-fpm + - php-enchant + - php-IDNA_Convert + - php-mbstring + - php-mysql + - php-PHPMailer + - php-process + - php-simplepie + - php-xml diff --git a/wordpress-nginx/roles/mysql/tasks/main.yml b/wordpress-nginx/roles/mysql/tasks/main.yml index 4236c52eb..84edd3a49 100644 --- a/wordpress-nginx/roles/mysql/tasks/main.yml +++ b/wordpress-nginx/roles/mysql/tasks/main.yml @@ -1,11 +1,6 @@ --- - name: Install Mysql package - yum: name={{ item }} state=present - with_items: - - mysql-server - - MySQL-python - - libselinux-python - - libsemanage-python + yum: name={{ db_packages }} state=present - name: Configure SELinux to start mysql on any port seboolean: name=mysql_connect_any state=true persistent=yes diff --git a/wordpress-nginx/roles/php-fpm/tasks/main.yml b/wordpress-nginx/roles/php-fpm/tasks/main.yml index 4778ce157..e163bf467 100644 --- a/wordpress-nginx/roles/php-fpm/tasks/main.yml +++ b/wordpress-nginx/roles/php-fpm/tasks/main.yml @@ -1,17 +1,6 @@ --- - name: Install php-fpm and deps - yum: name={{ item }} state=present - with_items: - - php - - php-fpm - - php-enchant - - php-IDNA_Convert - - php-mbstring - - php-mysql - - php-PHPMailer - - php-process - - php-simplepie - - php-xml + yum: name={{ php_packages }} state=present - name: Disable default pool command: mv /etc/php-fpm.d/www.conf /etc/php-fpm.d/www.disabled creates=/etc/php-fpm.d/www.disabled From bf3473cb98ac93b31b7fb914e351e1aaee30b5a5 Mon Sep 17 00:00:00 2001 From: speedlight Date: Wed, 21 Nov 2018 11:24:46 -0500 Subject: [PATCH 3/7] yum deprectation warnings for jboos-standalone playbook --- jboss-standalone/group_vars/all | 6 ++++++ jboss-standalone/roles/jboss-standalone/tasks/main.yml | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/jboss-standalone/group_vars/all b/jboss-standalone/group_vars/all index a49e86cad..cb63adb32 100644 --- a/jboss-standalone/group_vars/all +++ b/jboss-standalone/group_vars/all @@ -20,3 +20,9 @@ wait_for_port: 22 # This user name will be set by Tower, when run through Tower tower_user_name: admin + +java_packages: + - unzip + - java-1.7.0-openjdk + - libselinux-python + - libsemanage-python diff --git a/jboss-standalone/roles/jboss-standalone/tasks/main.yml b/jboss-standalone/roles/jboss-standalone/tasks/main.yml index f44ac1884..4f170b61b 100644 --- a/jboss-standalone/roles/jboss-standalone/tasks/main.yml +++ b/jboss-standalone/roles/jboss-standalone/tasks/main.yml @@ -1,13 +1,8 @@ --- - name: Install Java 1.7 and some basic dependencies yum: - name: "{{ item }}" + name: "{{ java_packages }}" state: present - with_items: - - unzip - - java-1.7.0-openjdk - - libselinux-python - - libsemanage-python - name: Download JBoss from jboss.org get_url: From 7085f051675d126c6c468be03364c52b83dbee47 Mon Sep 17 00:00:00 2001 From: speedlight Date: Wed, 21 Nov 2018 11:33:39 -0500 Subject: [PATCH 4/7] yum deprectation warnings for lamp-haproxy playbook --- lamp_haproxy/group_vars/all | 32 +++++++++++++++++++ lamp_haproxy/roles/base-apache/tasks/main.yml | 7 +--- lamp_haproxy/roles/common/tasks/main.yml | 14 ++------ lamp_haproxy/roles/db/tasks/main.yml | 5 +-- lamp_haproxy/roles/nagios/tasks/main.yml | 11 +------ 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/lamp_haproxy/group_vars/all b/lamp_haproxy/group_vars/all index 7f74b0acd..815ed0baa 100644 --- a/lamp_haproxy/group_vars/all +++ b/lamp_haproxy/group_vars/all @@ -3,3 +3,35 @@ httpd_port: 80 ntpserver: 192.168.1.2 + +base_packages: + - httpd + - php + - php-mysql + - git + +python_selinux_packages: + - libselinux-python + - libsemanage-python + +nagios_packages: + - nagios + - nagios-plugins + - nagios-plugins-nrpe + - nagios-plugins-ping + - nagios-plugins-ssh + - nagios-plugins-http + - nagios-plugins-mysql + - nagios-devel + +nagios_plugins_packages: + - nagios-nrpe + - nagios-plugins-swap + - nagios-plugins-users + - nagios-plugins-procs + - nagios-plugins-load + - nagios-plugins-disk + +db_packages: + - mysql-server + - MySQL-python diff --git a/lamp_haproxy/roles/base-apache/tasks/main.yml b/lamp_haproxy/roles/base-apache/tasks/main.yml index 310d16404..e38a4855f 100644 --- a/lamp_haproxy/roles/base-apache/tasks/main.yml +++ b/lamp_haproxy/roles/base-apache/tasks/main.yml @@ -3,13 +3,8 @@ - name: Install http yum: - name: "{{ item }}" + name: "{{ base_packages }}" state: present - with_items: - - httpd - - php - - php-mysql - - git - name: Configure SELinux to allow httpd to connect to remote database seboolean: diff --git a/lamp_haproxy/roles/common/tasks/main.yml b/lamp_haproxy/roles/common/tasks/main.yml index b82900c93..54adb8310 100644 --- a/lamp_haproxy/roles/common/tasks/main.yml +++ b/lamp_haproxy/roles/common/tasks/main.yml @@ -2,10 +2,7 @@ # This role contains common plays that will run on all nodes. - name: Install python bindings for SE Linux - yum: name={{ item }} state=present - with_items: - - libselinux-python - - libsemanage-python + yum: name={{ python_selinux_packages }} state=present - name: Create the repository for EPEL copy: src=epel.repo dest=/etc/yum.repos.d/epel.repo @@ -14,14 +11,7 @@ copy: src=RPM-GPG-KEY-EPEL-6 dest=/etc/pki/rpm-gpg - name: install some useful nagios plugins - yum: name={{ item }} state=present - with_items: - - nagios-nrpe - - nagios-plugins-swap - - nagios-plugins-users - - nagios-plugins-procs - - nagios-plugins-load - - nagios-plugins-disk + yum: name={{ nagios_plugins_packages }} state=present - name: Install ntp yum: name=ntp state=present diff --git a/lamp_haproxy/roles/db/tasks/main.yml b/lamp_haproxy/roles/db/tasks/main.yml index 71052795f..d6d5bd388 100644 --- a/lamp_haproxy/roles/db/tasks/main.yml +++ b/lamp_haproxy/roles/db/tasks/main.yml @@ -2,10 +2,7 @@ # This role will install MySQL and create db user and give permissions. - name: Install Mysql package - yum: name={{ item }} state=present - with_items: - - mysql-server - - MySQL-python + yum: name={{ db_packages }} state=present - name: Configure SELinux to start mysql on any port seboolean: name=mysql_connect_any state=true persistent=yes diff --git a/lamp_haproxy/roles/nagios/tasks/main.yml b/lamp_haproxy/roles/nagios/tasks/main.yml index 69e2d43ad..580240c7b 100644 --- a/lamp_haproxy/roles/nagios/tasks/main.yml +++ b/lamp_haproxy/roles/nagios/tasks/main.yml @@ -2,16 +2,7 @@ # This will install nagios - name: install nagios - yum: pkg={{ item }} state=present - with_items: - - nagios - - nagios-plugins - - nagios-plugins-nrpe - - nagios-plugins-ping - - nagios-plugins-ssh - - nagios-plugins-http - - nagios-plugins-mysql - - nagios-devel + yum: pkg={{ nagios_packages }} state=present notify: restart httpd - name: create nagios config dir From b83c16958e711661c4b661b0cd12149fb7596473 Mon Sep 17 00:00:00 2001 From: speedlight Date: Wed, 21 Nov 2018 11:37:46 -0500 Subject: [PATCH 5/7] yum deprectation warnings for lamp_simple_rhel7 playbook --- lamp_simple_rhel7/group_vars/all | 15 +++++++++++++++ lamp_simple_rhel7/roles/common/tasks/main.yml | 6 +----- lamp_simple_rhel7/roles/db/tasks/main.yml | 5 +---- .../roles/web/tasks/install_httpd.yml | 11 +---------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/lamp_simple_rhel7/group_vars/all b/lamp_simple_rhel7/group_vars/all index 74ca4581c..6d480af9b 100644 --- a/lamp_simple_rhel7/group_vars/all +++ b/lamp_simple_rhel7/group_vars/all @@ -4,3 +4,18 @@ httpd_port: 80 ntpserver: 192.168.1.2 repository: https://github.com/bennojoy/mywebapp.git + +common_packages: + - libselinux-python + - libsemanage-python + - firewalld + +db_packages: + - mariadb-server + - MySQL-python + +web_packages: + - httpd + - php + - php-mysql + - git diff --git a/lamp_simple_rhel7/roles/common/tasks/main.yml b/lamp_simple_rhel7/roles/common/tasks/main.yml index 3a19948af..6837a0262 100644 --- a/lamp_simple_rhel7/roles/common/tasks/main.yml +++ b/lamp_simple_rhel7/roles/common/tasks/main.yml @@ -6,11 +6,7 @@ tags: ntp - name: Install common dependencies - yum: name={{ item }} state=installed - with_items: - - libselinux-python - - libsemanage-python - - firewalld + yum: name={{ common_packages }} state=installed - name: Configure ntp file template: src=ntp.conf.j2 dest=/etc/ntp.conf diff --git a/lamp_simple_rhel7/roles/db/tasks/main.yml b/lamp_simple_rhel7/roles/db/tasks/main.yml index 27a2f42cc..d30f6c7f2 100644 --- a/lamp_simple_rhel7/roles/db/tasks/main.yml +++ b/lamp_simple_rhel7/roles/db/tasks/main.yml @@ -2,10 +2,7 @@ # This playbook will install MariaDB and create db user and give permissions. - name: Install MariaDB package - yum: name={{ item }} state=installed - with_items: - - mariadb-server - - MySQL-python + yum: name={{ db_packages }} state=installed - name: Configure SELinux to start mysql on any port seboolean: name=mysql_connect_any state=true persistent=yes diff --git a/lamp_simple_rhel7/roles/web/tasks/install_httpd.yml b/lamp_simple_rhel7/roles/web/tasks/install_httpd.yml index ede2ea823..3c34723d4 100644 --- a/lamp_simple_rhel7/roles/web/tasks/install_httpd.yml +++ b/lamp_simple_rhel7/roles/web/tasks/install_httpd.yml @@ -2,16 +2,7 @@ # These tasks install http and the php modules. - name: Install httpd and php - yum: name={{ item }} state=present - with_items: - - httpd - - php - - php-mysql - -- name: Install web role specific dependencies - yum: name={{ item }} state=installed - with_items: - - git + yum: name={{ web_packages }} state=present - name: Start firewalld service: name=firewalld state=started enabled=yes From 4d12e8ef3f3ed1e3adb53f32749630e063843a8c Mon Sep 17 00:00:00 2001 From: speedlight Date: Wed, 21 Nov 2018 11:40:53 -0500 Subject: [PATCH 6/7] yum deprectation warnings for mongodb playbook --- mongodb/group_vars/all | 8 ++++++++ mongodb/roles/common/tasks/main.yml | 8 +------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mongodb/group_vars/all b/mongodb/group_vars/all index 4ea2a0185..6735d0cda 100644 --- a/mongodb/group_vars/all +++ b/mongodb/group_vars/all @@ -23,3 +23,11 @@ iface: '{{ ansible_default_ipv4.interface }}' # The password for admin user mongo_admin_pass: 123456 + +mongodb_packages: + - libselinux-python + - mongo-10gen + - mongo-10gen-server + - bc + - python-pip + diff --git a/mongodb/roles/common/tasks/main.yml b/mongodb/roles/common/tasks/main.yml index e8f4803f6..2d386955c 100644 --- a/mongodb/roles/common/tasks/main.yml +++ b/mongodb/roles/common/tasks/main.yml @@ -20,13 +20,7 @@ file: path={{ mongodb_datadir_prefix }} owner=mongod group=mongod state=directory - name: Install the mongodb package - yum: name={{ item }} state=installed - with_items: - - libselinux-python - - mongo-10gen - - mongo-10gen-server - - bc - - python-pip + yum: name={{ mongodb_packages }} state=installed - name: Install the latest pymongo package pip: name=pymongo state=latest use_mirrors=no From 89660a692610104a4a5febf733ea04790c4d43fc Mon Sep 17 00:00:00 2001 From: speedlight Date: Wed, 21 Nov 2018 11:46:41 -0500 Subject: [PATCH 7/7] yum deprectation warnings for wordpress-nginx_rhel7 playbook --- wordpress-nginx_rhel7/group_vars/all | 18 ++++++++++++++++++ .../roles/mariadb/tasks/main.yml | 7 +------ .../roles/php-fpm/tasks/main.yml | 13 +------------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/wordpress-nginx_rhel7/group_vars/all b/wordpress-nginx_rhel7/group_vars/all index a7aaf5a9a..33b421b01 100644 --- a/wordpress-nginx_rhel7/group_vars/all +++ b/wordpress-nginx_rhel7/group_vars/all @@ -26,3 +26,21 @@ auto_up_disable: false # false = Development, minor, and major updates are all disabled # minor = Minor updates are enabled, development, and major updates are disabled core_update_level: true + +mariadb_packages: + - mariadb-server + - MySQL-python + - libselinux-python + - libsemanage-python + +php_packages: + - php + - php-fpm + - php-enchant + - php-IDNA_Convert + - php-mbstring + - php-mysql + - php-PHPMailer + - php-process + - php-simplepie + - php-xml diff --git a/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml b/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml index 5f930bf8c..40bd158e5 100644 --- a/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml +++ b/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml @@ -2,12 +2,7 @@ # This playbook will install MariaDB and create db user and give permissions. - name: Install MariaDB package - yum: name={{ item }} state=installed - with_items: - - mariadb-server - - MySQL-python - - libselinux-python - - libsemanage-python + yum: name={{ mariadb_packages }} state=installed - name: Configure SELinux to start mysql on any port seboolean: name=mysql_connect_any state=true persistent=yes diff --git a/wordpress-nginx_rhel7/roles/php-fpm/tasks/main.yml b/wordpress-nginx_rhel7/roles/php-fpm/tasks/main.yml index 4778ce157..e163bf467 100644 --- a/wordpress-nginx_rhel7/roles/php-fpm/tasks/main.yml +++ b/wordpress-nginx_rhel7/roles/php-fpm/tasks/main.yml @@ -1,17 +1,6 @@ --- - name: Install php-fpm and deps - yum: name={{ item }} state=present - with_items: - - php - - php-fpm - - php-enchant - - php-IDNA_Convert - - php-mbstring - - php-mysql - - php-PHPMailer - - php-process - - php-simplepie - - php-xml + yum: name={{ php_packages }} state=present - name: Disable default pool command: mv /etc/php-fpm.d/www.conf /etc/php-fpm.d/www.disabled creates=/etc/php-fpm.d/www.disabled