Skip to content

Merge stable/3.0 branch#1

Open
vuntz wants to merge 34 commits intosap-oc:stable/sap/3.0from
vuntz:staging-merge-3.0
Open

Merge stable/3.0 branch#1
vuntz wants to merge 34 commits intosap-oc:stable/sap/3.0from
vuntz:staging-merge-3.0

Conversation

@vuntz
Copy link

@vuntz vuntz commented Feb 21, 2017

The changes here are only relevant for new installs; this has no impact on existing deployments.

jsuchome and others added 30 commits September 23, 2016 07:58
(cherry picked from commit 99beec7)
Backport to 3.0

(cherry picked from commit 5069cba)
install-chef-suse: Fix syntax error
Chef now works around a missing Ruby feature by checking no_proxy
itself and matching against it when returning if a proxy connection
is required, so drop the http_proxy workaround and set no_proxy
directly. Since the script talks to both the hostname and the IP, add
them both.

Cherry-picked from 43d7b60.
…e-no_proxy

Set no_proxy in install-chef-suse.sh (bsc#998968)
[stable/3.0] Remove possible failed file before starting (again)
As a stop gap before this code is rewritten to use the systemd
methods, just ignore the failure since the whole feature is optional
anyway.

(cherry picked from commit e093088)
otherwise 1.9.3 is used and gems can't be installed

(cherry picked from commit 25d6cf0)
also install as user otherwise there are permission errors

(cherry picked from commit ac16615)
[stable/3.0] Update the OS values after the package upgrade of admin server
[3.0] Do not require deprecated /etc/sysconfig/clock (bsc#983837)
in some occasions the files have disappeared for unknown reasons after
the admin server upgrade.
not only because of that it makes sense to copy them away to a safe
place.
…a-yml-backup

[3.0] upgrade: make a backup of the important database state
This script is required in case the solr database is stored in tmpfs.

(cherry picked from commit 6fc690c)
[3.0] Add script to reindex the solr database
…tatus

upgrade: set status to failed when admin upgrade failed (bsc#1015312)
It's part of the crowbar-core package nowadays

(cherry picked from commit 58e9931)
upgrade: Remove old chef-created crowbar.service unit
the api has to return a hash, not a plain string
…in-upgrade-error2

[3.0] upgrade: correct the error format
We need to move the logging of command line args _before_ we parse and
shift them.

(cherry picked from commit d93fb39)
install-suse-cloud: log command line args
@rsalevsky rsalevsky changed the base branch from staging to stable/sap/3.0 March 9, 2017 12:35
@jdsn
Copy link

jdsn commented Mar 17, 2017

@vuntz this may need a rebase, at least patch is not able to merge it in crowbar-testbuild (maybe due to different merging strategies in patch and git)

@vuntz
Copy link
Author

vuntz commented Mar 17, 2017

@vuntz this may need a rebase, at least patch is not able to merge it in crowbar-testbuild (maybe due to different merging strategies in patch and git)

@jdsn It's a merge of the branch, so it's not something to rebase. Is testbuild using the .patch url or the .diff url? The .patch is likely not going to work, while .diff should work.

@jdsn
Copy link

jdsn commented Mar 17, 2017

@vuntz its using .patch
Hmmm, then we might need to add a fallback with the .diff url - not sure if it is safe to just switch entirely to .diff - .patch might be there for a reason. I am chaning the tool currently anyway, so I will have a look.

@jdsn
Copy link

jdsn commented Apr 4, 2017

@vuntz
A rebuild will be done today with the new crowbar-testbuild tool which will try diff first and patch as fallback if diff fails.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants