diff options
| author | Ricky Elrod <codeblock@fedoraproject.org> | 2017-09-15 20:50:18 +0000 |
|---|---|---|
| committer | Ricky Elrod <codeblock@fedoraproject.org> | 2017-09-15 20:50:18 +0000 |
| commit | a495149eb96c331140132f92c097e42d16f6d978 (patch) | |
| tree | 5569ed89bc6c90a57d6ee4b80f1bdc93196accdb | |
| parent | 85d748c9439fdd7025ec385c4f52ddd9783c5a30 (diff) | |
| parent | 08ab5dd6f06ffc62c20e87bfde5cd2b8ce6b0bc9 (diff) | |
| download | ansible-a495149eb96c331140132f92c097e42d16f6d978.tar.gz ansible-a495149eb96c331140132f92c097e42d16f6d978.tar.xz ansible-a495149eb96c331140132f92c097e42d16f6d978.zip | |
Merge branch 'master' of /git/ansible
| -rw-r--r-- | inventory/host_vars/ansiblemagazine.fedorainfracloud.org | 5 | ||||
| -rw-r--r-- | playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml | 4 | ||||
| -rw-r--r-- | roles/base/templates/krb5.conf.j2 | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/inventory/host_vars/ansiblemagazine.fedorainfracloud.org b/inventory/host_vars/ansiblemagazine.fedorainfracloud.org index 9ccb71e7f..c268d0de1 100644 --- a/inventory/host_vars/ansiblemagazine.fedorainfracloud.org +++ b/inventory/host_vars/ansiblemagazine.fedorainfracloud.org @@ -9,13 +9,13 @@ tcp_ports: [22, 80, 443] inventory_tenant: persistent inventory_instance_name: ansiblemagazine hostbase: ansiblemagazine -public_ip: +public_ip: 209.132.184.238 root_auth_users: gdk rbergero pfrields description: Ansible Magazine host_backup_targets: ['/backups', '/var/www/html'] dbs_to_backup: ['wp'] -mariadb_root_password: "{{ ansiblemagazine_mariadb_password }}" +mariadb_root_password: "{{ ansiblemagazine_db_password }}" extra_enablerepos: '' cloud_networks: @@ -26,3 +26,4 @@ nagios_Check_Services: nrpe: true sshd: true httpd: true + swap: false diff --git a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml index 6299ef3ce..a7b30a297 100644 --- a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml +++ b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: magazine2.fedorainfracloud.org + hosts: ansiblemagazine.fedorainfracloud.org gather_facts: False vars_files: @@ -61,7 +61,7 @@ post_tasks: - name: create databaseuser - mysql_user: name=magazine + mysql_user: name=ansiblemagazine host=localhost state=present password="{{ ansiblemagazine_db_password }}" diff --git a/roles/base/templates/krb5.conf.j2 b/roles/base/templates/krb5.conf.j2 index 83b4b821a..c07504b45 100644 --- a/roles/base/templates/krb5.conf.j2 +++ b/roles/base/templates/krb5.conf.j2 @@ -25,5 +25,8 @@ [domain_realm] .fedoraproject.org = FEDORAPROJECT.ORG fedoraproject.org = FEDORAPROJECT.ORG +{% if env == "staging" %} + .stg.phx2.fedoraproject.org = STG.FEDORAPROJECT.ORG +{% endif %} .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG stg.fedoraproject.org = STG.FEDORAPROJECT.ORG |