diff --git a/admin-guide/deployment/workflow.rst b/admin-guide/deployment/workflow.rst index de4255cb..d08f3ac7 100644 --- a/admin-guide/deployment/workflow.rst +++ b/admin-guide/deployment/workflow.rst @@ -11,9 +11,9 @@ Deploying a new environment requires the following: - Environment format: ``data-`` - And change permissions accordingly - - Configure the necessary webhooks for the puppet01 and puppet00-test server + - Configure the necessary webhooks for the Puppet and Sysdb server - 3. Configuring the environment in Puppet (``puppet01.psi.ch``) + 3. Configuring the environment in Puppet (e.g. ``puppet01.psi.ch``) Configuring the environment in sysdb ------------------------------------ @@ -75,17 +75,18 @@ The steps to create and configure a new **GIT** project are: 2. Configure *project* permissions as follows: - - ``[data-[Settings]->[Repository]``, or directly: https://git.psi.ch/linux-infra/data-(environment_name)/settings/repository + - ``[data-[Settings]->[Repository]``, or directly: https://git.psi.ch/linux-infra/hiera/data-(environment_name)/-/settings/repository - ``[Deploy Keys]`` -> select ``root@puppet01.psi.ch'`` -> click on ``'Enable'`` - - ``[data-[Settings]->[Members]``, or directly: https://git.psi.ch/linux-infra/data-(environment_name)/project_members + - ``[data-[Settings]->[Members]``, or directly: https://git.psi.ch/linux-infra/hiera/data-(environment_name)/project_members - Setup specific permissions for specific users or groups. In example: - Set project ``Master``: - ``[Select members to invite]`` (``caubet_m``) + ``[Choose a role permission]`` (``Master``) + ``[Add to project]`` - Set other roles: - ``[Select members to invite]`` (``ozerov_d``) + ``[Choose a role permission]`` (``Developer``) + ``[Add to project]`` - - ``[data-[Settings]->[Integrations]``, or directly: https://git.psi.ch/linux-infra/data-(environment_name)/settings/integrations - - Add WebHook as follows: + - ``[data-[Settings]->[Integrations]``, or directly: https://git.psi.ch/linux-infra/hiera/data-(environment_name)/-/hooks + - Add WebHooks as follows: - ``[URL]``: http://puppet01.psi.ch/events/dataupdate + - ``[URL]``: http://sysdb.psi.ch/events/dataupdate - (Checked) ``[Push events]``. Uncheck the rest. - ``[SSL verification]`` -> (uncheck) ``[Enable SSL verification]`` - Confirm information from above, and click on ``[Add webhook]`` to add the new WebHook. @@ -95,11 +96,11 @@ Test new environment in GIT In order to test that environment was successfully created:: - git clone git@git.psi.ch:linux-infra/data-.git + git clone git@git.psi.ch:linux-infra/hiera/data-.git In example:: - caubet_m@caubet-laptop:~/GIT$ git clone git@git.psi.ch:linux-infra/data-meg.git + caubet_m@caubet-laptop:~/GIT$ git clone git@git.psi.ch:linux-infra/hiera/data-meg.git Cloning into 'data-meg'... X11 forwarding request failed warning: You appear to have cloned an empty repository. diff --git a/admin-guide/puppet/hiera.rst b/admin-guide/puppet/hiera.rst index fa7dd46f..9d27272e 100644 --- a/admin-guide/puppet/hiera.rst +++ b/admin-guide/puppet/hiera.rst @@ -33,8 +33,8 @@ Sysdb environments data ^^^^^^^^^^^^^^^^^^^^^^^ Each sysdb environment has a dedicated hiera repository, called ``data-``, -eg. `data-hpc `_ -and `data-sls `_. +eg. `data-hpc `_ +and `data-sls `_. The first three levels of the filesystem structure shown before are actually the files inside this kind of repositories. diff --git a/infrastructure-guide/influx00.md b/infrastructure-guide/influx00.md index 44552e8d..470f0f36 100644 --- a/infrastructure-guide/influx00.md +++ b/infrastructure-guide/influx00.md @@ -1,7 +1,7 @@ # influx00 This is a RHEL7 machine and is puppet managed: -https://git.psi.ch/linux-infra/data-lx/blob/master/default/influx00.psi.ch.yaml +https://git.psi.ch/linux-infra/hiera/data-lx/blob/master/default/influx00.psi.ch.yaml Runs the influxdb backend for the metrics.psi.ch service, as part of the telegraph, influxdb and grafana stack. @@ -104,7 +104,7 @@ For this, connect to: - Yes, all the data is stored on the VM disk image. -- The configuration file `/etc/influxdb/influxdb.conf` does report that its managed via puppet. However I don't see anything in the puppet configuration https://git.psi.ch/linux-infra/data-lx/blob/master/default/influx00.psi.ch.yaml. Where does this file come from? +- The configuration file `/etc/influxdb/influxdb.conf` does report that its managed via puppet. However I don't see anything in the puppet configuration https://git.psi.ch/linux-infra/hiera/data-lx/blob/master/default/influx00.psi.ch.yaml. Where does this file come from? ``` ######################################################################## # diff --git a/infrastructure-guide/login.md b/infrastructure-guide/login.md index 1a41d0d2..00eacc75 100644 --- a/infrastructure-guide/login.md +++ b/infrastructure-guide/login.md @@ -1,6 +1,6 @@ # login -This is a cluster made up of 3 hosts, which all are VMs running on the AIT vmware cluster. These machines are pretty standard RHEL7 hosts managed by Puppet: https://git.psi.ch/linux-infra/data-lx/blob/master/login.yaml. +This is a cluster made up of 3 hosts, which all are VMs running on the AIT vmware cluster. These machines are pretty standard RHEL7 hosts managed by Puppet: https://git.psi.ch/linux-infra/hiera/data-lx/blob/master/login.yaml. Info for users is published at https://intranet.psi.ch/de/computing/linux-login-clusters diff --git a/infrastructure-guide/lxsup00.md b/infrastructure-guide/lxsup00.md index 2d42b0db..1e3da5e4 100644 --- a/infrastructure-guide/lxsup00.md +++ b/infrastructure-guide/lxsup00.md @@ -1,4 +1,4 @@ # lxsup00 This is a RHEL7 machine and is puppet managed: -https://git.psi.ch/linux-infra/data-lx/blob/master/default/lxsup00.psi.ch.yaml +https://git.psi.ch/linux-infra/hiera/data-lx/blob/master/default/lxsup00.psi.ch.yaml diff --git a/infrastructure-guide/lxweb00.md b/infrastructure-guide/lxweb00.md index 0b5efa5a..d7e76e0e 100644 --- a/infrastructure-guide/lxweb00.md +++ b/infrastructure-guide/lxweb00.md @@ -1,7 +1,7 @@ # lxweb00 This is a RHEL7 machine and is puppet managed. The httpd configuration seem to be managed there as well: -https://git.psi.ch/linux-infra/data-lx/blob/master/default/lxweb00.psi.ch.yaml +https://git.psi.ch/linux-infra/hiera/data-lx/blob/master/default/lxweb00.psi.ch.yaml Exports various paths from AFS to http(s), see /etc/httpd/conf.d/ for details. The AFS directories exported are: diff --git a/infrastructure-guide/metrics00.md b/infrastructure-guide/metrics00.md index bd7bfae6..b5716782 100644 --- a/infrastructure-guide/metrics00.md +++ b/infrastructure-guide/metrics00.md @@ -1,7 +1,7 @@ # metrics00 This machine is a RHEL7 machine and is puppet managed: -https://git.psi.ch/linux-infra/data-lx/blob/master/default/metrics00.psi.ch.yaml +https://git.psi.ch/linux-infra/hiera/data-lx/blob/master/default/metrics00.psi.ch.yaml Runs the grafana frontend service at https://metrics.psi.ch, as part of the telegraph, influxdb and grafana stack.