Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Berendt <[email protected]>
  • Loading branch information
berendt committed Aug 18, 2024
1 parent 55c44ad commit 6b96d0b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
20 changes: 12 additions & 8 deletions docs/guides/configuration-guide/manager.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ In the example, OSISM release 7.0.5 is used.
git push
```

## Working with Git-Branches

:::info
## Working with Git branches

For example, for compliance and security reasons, many organizations prefer to prepare changes to
production systems on dedicated Git branches, roll them out to the production environment
Expand All @@ -79,38 +77,44 @@ review and release process.

A typical scenario is the [Manager Upgrade](../upgrade-guide/manager.mdx).

OSISM offers the option of using specific GIT branches on the Manager.

:::
OSISM offers the option of using specific Git branches on the manager.

The branch can be changed in the following way:
The Git branch can be changed in the following way:

1. Create a branch

```bash
git checkout -b YOUR-BRANCH-FOR-CHANGE-XYZ
```

2. Set the branch name of your deployment branch with the variable `configuration_git_version` in `configuration.yml`.
This needs always to be changed on the manager node later if you merge the current branch to another target branch.

```bash
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
sed -i "~s,^configuration_git_version:.*\$,configuration_git_version: ${BRANCH}," environments/configuration.yml
git commit -m "Starting to work on #<issue-id>" -s environment/configuration.yml
git push
```

3. Login to the manager and activate the branch
(not needed when performing a initial manager install )
(not needed when performing a initial manager install)

```bash
cd /opt/configuration
git fetch
git checkout YOUR-BRANCH-FOR-CHANGE-XYZ
osism apply configuration
```

4. *Recommended:* Rebuild inventories and update facts
(On changing branches there are oft potential changes in the inventory structure)

```
osism reconciler sync
osism apply facts
```

5. Start your work on the topic and perfom a final review when the topic is complete

## OpenSearch integration
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/deploy-guide/manager.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ on the seed node. The deployment of the seed node itself is documented in the
```
cd environments/manager
```
If you are working with git branches,
read [the instructions](../configuration-guide/manager.mdx).

If you are working with Git branches, read [the instructions](../configuration-guide/manager.mdx).

### Step 1: Create operator user

Expand Down

0 comments on commit 6b96d0b

Please sign in to comment.