diff options
9 files changed, 71 insertions, 1 deletions
diff --git a/pillar/openbook/ansible.sls b/pillar/openbook/ansible.sls index 547ee78..ba0aa08 100644 --- a/pillar/openbook/ansible.sls +++ b/pillar/openbook/ansible.sls @@ -61,6 +61,11 @@ ansible: source: mysql_client.yaml mode: "0644" is_template: False + playbooks_haveged_yaml: + name: playbooks/haveged.yaml + source: haveged.yaml + mode: "0644" + is_template: False playbooks_openjdk_yaml: name: playbooks/openjdk.yaml source: openjdk.yaml diff --git a/salt/openbook/admin_api_server/files/admin_api_server.json b/salt/openbook/admin_api_server/files/admin_api_server.json index ccdb6ef..ac80434 100644 --- a/salt/openbook/admin_api_server/files/admin_api_server.json +++ b/salt/openbook/admin_api_server/files/admin_api_server.json @@ -15,6 +15,7 @@ ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"application.port": {{ openbook_admin_api_server_port }} + ,"cluster.interfaces: ["{{ ansible_default_ipv4.address }}"] {% endif %} {% endraw %} } diff --git a/salt/openbook/admin_web_ui/files/admin_web_ui.json b/salt/openbook/admin_web_ui/files/admin_web_ui.json index a1c1632..482b14b 100644 --- a/salt/openbook/admin_web_ui/files/admin_web_ui.json +++ b/salt/openbook/admin_web_ui/files/admin_web_ui.json @@ -3,6 +3,7 @@ {% raw %} {% if "True" == openbook_install_admin_web_ui|string() %} ,"application.port": {{ openbook_admin_web_ui_port }} + ,"cluster.interfaces: ["{{ ansible_default_ipv4.address }}"] {% endif %} {% endraw %} } diff --git a/salt/openbook/ansible/files/haveged.yaml b/salt/openbook/ansible/files/haveged.yaml new file mode 100644 index 0000000..11b2371 --- /dev/null +++ b/salt/openbook/ansible/files/haveged.yaml @@ -0,0 +1,36 @@ +--- +- name: "Install haveged" + hosts: target + tasks: + - name: "Install haveged package" + apt: + pkg: "{{ item }}" + state: present + with_items: + - haveged + when: ansible_distribution == "Ubuntu" + + - name: "Install haveged package" + yum: + name: "{{ item }}" + state: present + with_items: + - haveged + when: ansible_distribution == "RedHat" or ansible_distribution == "CentOS" + + - name: "Install haveged package" + portage: + name: "{{ item }}" + state: present + with_items: + - sys-apps/haveged + when: ansible_distribution == "Gentoo" + + - name: "Enable haveged" + service: + name: "{{ item.name }}" + enabled: yes + state: started + runlevel: "{{ item.runlevel }}" + with_items: + - { name: haveged, runlevel: default } diff --git a/salt/openbook/ansible/files/main.cf b/salt/openbook/ansible/files/main.cf new file mode 100644 index 0000000..34253fc --- /dev/null +++ b/salt/openbook/ansible/files/main.cf @@ -0,0 +1,23 @@ +smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu) +biff = no +append_dot_mydomain = no +readme_directory = no + +smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem +smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key +smtpd_use_tls=yes +smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache +smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache + +smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination +myhostname = {{ }} +alias_maps = hash:/etc/aliases +alias_database = hash:/etc/aliases +myorigin = /etc/mailname +mydestination = verizoncloudplatform.com, $myhostname, localhost, localhost.localdomain, localhost +relayhost = 98.132.135.94 +mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 +mailbox_size_limit = 0 +recipient_delimiter = + +inet_interfaces = all +inet_protocols = all diff --git a/salt/openbook/customer_api_server/files/customer_api_server.json b/salt/openbook/customer_api_server/files/customer_api_server.json index e471e81..474a140 100644 --- a/salt/openbook/customer_api_server/files/customer_api_server.json +++ b/salt/openbook/customer_api_server/files/customer_api_server.json @@ -15,6 +15,7 @@ ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"application.port": {{ openbook_customer_api_server_port }} -{% endif %} + ,"cluster.interfaces: ["{{ ansible_default_ipv4.address }}"] + {% endif %} {% endraw %} } diff --git a/salt/openbook/customer_web_ui/files/customer_web_ui.json b/salt/openbook/customer_web_ui/files/customer_web_ui.json index 94e7c19..34c95c7 100644 --- a/salt/openbook/customer_web_ui/files/customer_web_ui.json +++ b/salt/openbook/customer_web_ui/files/customer_web_ui.json @@ -3,6 +3,7 @@ {% raw %} {% if "True" == openbook_install_customer_web_ui|string() %} ,"application.port": {{ openbook_customer_web_ui_port }} + ,"cluster.interfaces: ["{{ ansible_default_ipv4.address }}"] {% endif %} {% endraw %} } diff --git a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json index 2e9c251..2df370c 100644 --- a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json +++ b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json @@ -13,6 +13,7 @@ {% if "True" == openbook_install_job_scheduler_server|string() %} ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" + ,"cluster.interfaces: ["{{ ansible_default_ipv4.address }}"] {% endif %} {% endraw %} } diff --git a/salt/openbook/workflow_server/files/workflow_server.json b/salt/openbook/workflow_server/files/workflow_server.json index 1ee399e..c9fe39f 100644 --- a/salt/openbook/workflow_server/files/workflow_server.json +++ b/salt/openbook/workflow_server/files/workflow_server.json @@ -13,6 +13,7 @@ {% if "True" == openbook_install_workflow_server|string() %} ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" + ,"cluster.interfaces: ["{{ ansible_default_ipv4.address }}"] {% endif %} {% endraw %} } |