diff --git a/sysadm/deployment/deployment-environments.rst b/sysadm/deployment/deployment-environments.rst index 7243a53..5470e39 100644 --- a/sysadm/deployment/deployment-environments.rst +++ b/sysadm/deployment/deployment-environments.rst @@ -1,58 +1,58 @@ .. _deployment-environments: Reference: Deployment Environments ================================== We have 2 main environments for deployment: - staging - production Staging Environment ------------------- Staging nodes are currently running in the `hypervisor pompidou `__. The environment components are listed in `the inventory `__ |staging_environment| .. _provisioning_source: Provisioning source ^^^^^^^^^^^^^^^^^^^ The source for the provisioning of those nodes is declared in the `swh-sysadmin-provisioning -`__ +`__ repository. Its source code is a mix of `terraform `__ with `terraform-proxmox `__ plugin DSL. .. _configuration_source: Configuration source ^^^^^^^^^^^^^^^^^^^^ The source for the configuration of those nodes is our `puppet manifest swh-site -repository `__ on the +repository `__ on the *staging* branch (for the production nodes, it's the *production* branch). Access ^^^^^^ `Those machines `__ are ssh accessible like the production ones as long as you have `vpn access `__ to the infrastructure. .. |staging_environment| image:: ../images/staging-environment.svg :target: ../_images/staging-environment.svg Production Environment ---------------------- .. todo:: This section is a work in progress. diff --git a/sysadm/puppet/howto-deploy-puppet-change.rst b/sysadm/puppet/howto-deploy-puppet-change.rst index 560b943..6a9bb4f 100644 --- a/sysadm/puppet/howto-deploy-puppet-change.rst +++ b/sysadm/puppet/howto-deploy-puppet-change.rst @@ -1,54 +1,54 @@ .. _puppet_deploy_change: How to deploy a Puppet change ============================= .. admonition:: Intended audience :class: important staff members with enough permissions to deploy Once done with the development changes and those are landed .. _puppet_deploy_automated: Automated ~~~~~~~~~ Once your change is landed in the *swh-site* repository, you need to deploy the manifest on the puppet master. Then puppet agent will refresh themselves and apply the changes themselves every 30min. .. code:: you@pergamon$ sudo swh-puppet-master-deploy .. _puppet_semi_automated: Semi-automated ~~~~~~~~~~~~~~ .. code:: you@localhost$ cd puppet-environment you@localhost$ bin/deploy-on machine1 machine2... -Note: `puppet-environment `_ +Note: `puppet-environment `_ Remember to pass ``--apt`` to ``bin/deploy-on`` if freshly uploaded Software Heritage packages are to be deployed. Also, ``bin/deploy-on --help`` is your friend. .. _puppet_manual_deployment: Manual ~~~~~~ .. code:: # if a new or updated version debian package needs deploying you@machine$ sudo apt-get update # to test/review changes you@machine$ sudo swh-puppet-test # to apply you@machine$ sudo swh-puppet-apply diff --git a/sysadm/puppet/reference-best-practices.rst b/sysadm/puppet/reference-best-practices.rst index 624af43..99a6718 100644 --- a/sysadm/puppet/reference-best-practices.rst +++ b/sysadm/puppet/reference-best-practices.rst @@ -1,9 +1,9 @@ .. _puppet_best_practices: Reference: Puppet best practices ================================ .. todo:: This page is a work in progress. Please refer to the `existing documentation - `_ and `the + `_ and `the wiki page `_.