diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2018-02-16 20:54:52 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2018-02-16 20:54:52 +0100 |
| commit | 96ced00e05b50f276841a9212ae89e018de4d92d (patch) | |
| tree | b86c75fa97326dc89cc37c6dd23d294bd13eb56a /playbooks | |
| parent | cd94e324d3401e518578d91382a2b7ee67562112 (diff) | |
| download | ands-96ced00e05b50f276841a9212ae89e018de4d92d.tar.gz ands-96ced00e05b50f276841a9212ae89e018de4d92d.tar.bz2 ands-96ced00e05b50f276841a9212ae89e018de4d92d.tar.xz ands-96ced00e05b50f276841a9212ae89e018de4d92d.zip | |
Updated to OpenShift 3.7 and tested
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/ands-gluster.yml | 15 | ||||
| -rw-r--r-- | playbooks/ands-prepare.yml | 18 | ||||
| -rw-r--r-- | playbooks/ands-vm-conf.yml | 5 | ||||
| -rw-r--r-- | playbooks/ands-vm-setup.yml | 5 | ||||
| l--------- | playbooks/openshift-deploy-cluster.yml | 1 | ||||
| -rw-r--r-- | playbooks/openshift-install.yml | 6 | ||||
| l--------- | playbooks/openshift-redeploy-certificates.yml | 2 | ||||
| -rw-r--r-- | playbooks/openshift-setup-projects.yml | 1 |
8 files changed, 42 insertions, 11 deletions
diff --git a/playbooks/ands-gluster.yml b/playbooks/ands-gluster.yml new file mode 100644 index 0000000..8aa30fc --- /dev/null +++ b/playbooks/ands-gluster.yml @@ -0,0 +1,15 @@ +- name: Common setup procedures + hosts: ands + roles: + - role: ands_facts + + +- name: Configure GlusterFS cluster + hosts: ands_servers + roles: + - role: glusterfs + vars: + glusterfs_network: "{{ ands_storage_network }}" + glusterfs_servers: "{{ ands_storage_servers }}" + glusterfs_bricks_path: "{{ ands_data_path }}/glusterfs" + glusterfs_domains: "{{ ands_storage_domains }}" diff --git a/playbooks/ands-prepare.yml b/playbooks/ands-prepare.yml index 9041563..b3a025b 100644 --- a/playbooks/ands-prepare.yml +++ b/playbooks/ands-prepare.yml @@ -36,12 +36,12 @@ vars: docker_exclude_vgs: "{{ [ ands_data_vg ] }}" -- name: Configure GlusterFS cluster - hosts: ands_servers - roles: - - role: glusterfs - vars: - glusterfs_network: "{{ ands_storage_network }}" - glusterfs_servers: "{{ ands_storage_servers }}" - glusterfs_bricks_path: "{{ ands_data_path }}/glusterfs" - glusterfs_domains: "{{ ands_storage_domains }}" +#- name: Configure GlusterFS cluster +# hosts: ands_servers +# roles: +# - role: glusterfs +# vars: +# glusterfs_network: "{{ ands_storage_network }}" +# glusterfs_servers: "{{ ands_storage_servers }}" +# glusterfs_bricks_path: "{{ ands_data_path }}/glusterfs" +# glusterfs_domains: "{{ ands_storage_domains }}" diff --git a/playbooks/ands-vm-conf.yml b/playbooks/ands-vm-conf.yml new file mode 100644 index 0000000..2b1020b --- /dev/null +++ b/playbooks/ands-vm-conf.yml @@ -0,0 +1,5 @@ +- name: Common setup procedures + hosts: ands_servers + roles: + - role: ands_vagrant_vmconf + diff --git a/playbooks/ands-vm-setup.yml b/playbooks/ands-vm-setup.yml new file mode 100644 index 0000000..d97916d --- /dev/null +++ b/playbooks/ands-vm-setup.yml @@ -0,0 +1,5 @@ +- name: Common setup procedures + hosts: vagrant + roles: + - role: ands_vagrant_vm + diff --git a/playbooks/openshift-deploy-cluster.yml b/playbooks/openshift-deploy-cluster.yml new file mode 120000 index 0000000..2a18fca --- /dev/null +++ b/playbooks/openshift-deploy-cluster.yml @@ -0,0 +1 @@ +../anslib/openshift-ansible/playbooks/deploy_cluster.yml
\ No newline at end of file diff --git a/playbooks/openshift-install.yml b/playbooks/openshift-install.yml index edbd2d8..f3a81ea 100644 --- a/playbooks/openshift-install.yml +++ b/playbooks/openshift-install.yml @@ -12,8 +12,12 @@ vars: node_id: "{{ hostvars[groups['masters'][0]]['ands_host_id'] }}" +- import_playbook: ../anslib/openshift-ansible/playbooks/prerequisites.yml -- include: ../anslib/openshift-ansible/playbooks/byo/config.yml +#- include: ../anslib/openshift-ansible/playbooks/byo/config.yml +#- include: ../anslib/openshift-ansible/playbooks/deploy_cluster.yml +- import_playbook: ../anslib/openshift-ansible/playbooks/deploy_cluster.yml +#- import_playbook: openshift-deploy-cluster.yml - name: Remove temporary entries in /etc/hosts hosts: nodes:!masters diff --git a/playbooks/openshift-redeploy-certificates.yml b/playbooks/openshift-redeploy-certificates.yml index ebc5150..f812372 120000 --- a/playbooks/openshift-redeploy-certificates.yml +++ b/playbooks/openshift-redeploy-certificates.yml @@ -1 +1 @@ -../anslib/openshift-ansible/playbooks/byo/openshift-cluster/redeploy-certificates.yml
\ No newline at end of file +../anslib/openshift-ansible/playbooks/redeploy-certificates.yml
\ No newline at end of file diff --git a/playbooks/openshift-setup-projects.yml b/playbooks/openshift-setup-projects.yml index 46d6767..a8af9c1 100644 --- a/playbooks/openshift-setup-projects.yml +++ b/playbooks/openshift-setup-projects.yml @@ -15,6 +15,7 @@ hosts: masters roles: - { role: ands_openshift, subrole: users } + - { role: ands_openshift, subrole: storage } - { role: ands_kaas } vars: kaas_projects: "{{ ands_openshift_projects.keys() }}" |