diff --git a/.gitmodules b/.gitmodules index dea01e5..e5b658d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = openshift-ansible url = git@github.com:openshift/openshift-ansible.git branch = release-3.11 +[submodule "integr8ly"] + path = integr8ly + url = https://github.com/integr8ly/installation.git diff --git a/README.md b/README.md index 30b81eb..d07bfef 100644 --- a/README.md +++ b/README.md @@ -116,10 +116,11 @@ openshift_master_identity_providers: EOF ``` -Create a file named `group_vars/all`, containing your global variables: +Create a file named `group_vars/all/itix.yaml`, containing your global variables: ```sh -cat < group_vars/OSEv3 +mkdir -p group_vars/all/ +cat < group_vars/all/itix.yaml --- # The regular user account you created on your server ansible_ssh_user: nicolas @@ -414,3 +415,10 @@ spec: name: ansible-tower-web-svc EOF ``` + +## Deploy Integr8ly + +```sh +cd integr8ly +ansible-playbook -i ../prod.hosts playbooks/install.yml +``` diff --git a/group_vars/.gitignore b/group_vars/.gitignore index 72e8ffc..6ce9f25 100644 --- a/group_vars/.gitignore +++ b/group_vars/.gitignore @@ -1 +1 @@ -* +OSEv3 diff --git a/group_vars/all/.gitignore b/group_vars/all/.gitignore new file mode 100644 index 0000000..50a1e9d --- /dev/null +++ b/group_vars/all/.gitignore @@ -0,0 +1 @@ +itix.yaml diff --git a/group_vars/all/common.yml b/group_vars/all/common.yml new file mode 120000 index 0000000..abaed94 --- /dev/null +++ b/group_vars/all/common.yml @@ -0,0 +1 @@ +../../integr8ly/inventories/group_vars/all/common.yml \ No newline at end of file diff --git a/group_vars/all/manifest.yaml b/group_vars/all/manifest.yaml new file mode 120000 index 0000000..fb4fc68 --- /dev/null +++ b/group_vars/all/manifest.yaml @@ -0,0 +1 @@ +../../integr8ly/inventories/group_vars/all/manifest.yaml \ No newline at end of file diff --git a/group_vars/all/zz-integreatly.yaml b/group_vars/all/zz-integreatly.yaml new file mode 100644 index 0000000..7a40aaf --- /dev/null +++ b/group_vars/all/zz-integreatly.yaml @@ -0,0 +1,7 @@ +prerequisites_install: false +run_master_tasks: true +ns_prefix: integr8ly- +create_cluster_admin: false +eval_self_signed_certs: false +keep_namespaces: true +eval_seed_users_count: 10 diff --git a/integr8ly b/integr8ly new file mode 160000 index 0000000..94c152c --- /dev/null +++ b/integr8ly @@ -0,0 +1 @@ +Subproject commit 94c152c742fcef81100f2b2c0b41775f7691ccbe diff --git a/prod.hosts b/prod.hosts index 3ae15df..2d33463 100644 --- a/prod.hosts +++ b/prod.hosts @@ -1,3 +1,10 @@ +# +# Variables used by Integr8ly +# + +[master:children] +masters + # # Variables used by the ITIX playbook #