[stable8.2] make swift url type configurable #21118

Merged
merged 2 commits into from Jan 8, 2016

Projects

None yet

7 participants

@butonic
Member
butonic commented Dec 10, 2015

Allows configuring the Interface, typically 'public, 'internal' or 'admin'

cc @felixboehm

@butonic butonic make url type configurable
b314da9
@mention-bot

By analyzing the blame information on this pull request, we identified @icewind1991, @MorrisJobke and @carlaschroder to be potential reviewers

@butonic
Member
butonic commented Dec 10, 2015

Needs port to master

@butonic butonic self-assigned this Dec 10, 2015
@DeepDiver1975 DeepDiver1975 commented on an outdated diff Dec 10, 2015
lib/private/files/objectstore/swift.php
@@ -77,7 +77,11 @@ protected function init() {
$serviceName = $this->params['serviceName'];
}
- $this->objectStoreService = $this->client->objectStoreService($serviceName, $this->params['region']);
+ $urlType = null;
+ if ($this->params['urlType']) {
@DeepDiver1975
DeepDiver1975 Dec 10, 2015 Member

please use isset()

@MorrisJobke
Member

Needs port to master

first of all we bring stuff to master and then backport stuff 🙈 ;)

@DeepDiver1975
Member

first of all we bring stuff to master and then backport stuff 🙈 ;)

indeed

@MorrisJobke
Member

@karlitschek Please approve this backport

@karlitschek
Member

please backport

@felixboehm
Contributor

This works nice.
Background here: Openstack provides 3 Swift endpoints and ownCloud used the service name "public" by default, which is ssl secured. We had some certificate issues then and want to use the "internal" service without ssl on an internal network.

@DeepDiver1975
Member

@butonic please submit PR against master first - I'm uncertain about the state of the CI system on stable8.2 regarding swift - failing test look ugly

@MorrisJobke MorrisJobke added this to the 8.2.2-current-maintenance milestone Dec 11, 2015
@DeepDiver1975
Member

not 8.2.2 from my perspective because not yet merged to master and both (master and this) pr fail on unit testing 👎

@butonic
Member
butonic commented Dec 14, 2015

looking into master pr

@DeepDiver1975
Member

moving to 8.2.3 - we are closing 8.2.2 tomorrow

@PVince81 PVince81 changed the title from make swift url type configurable to [stable8.2] make swift url type configurable Dec 24, 2015
@butonic butonic add isset for optional params
18379cd
@MorrisJobke
Member

Ping - the master PR is merged.

@DeepDiver1975
Member

👍

@DeepDiver1975 DeepDiver1975 merged commit f4a7991 into stable8.2 Jan 8, 2016

12 of 13 checks passed

smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #5462 failed in 20 sec
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #55232 succeeded in 25 sec
Details
core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #48686 succeeded in 12 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #22387 succeeded in 17 min
Details
core-ci-linux/database=oci,label=SLAVE Build #22387 succeeded in 19 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #22387 succeeded in 20 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #22387 succeeded in 9 min 51 sec
Details
ocs-api-integration-tests-ci Build #5497 succeeded in 53 sec
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #5482 succeeded in 11 min
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #5482 succeeded in 8 min 29 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #5482 succeeded in 12 min
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #5656 succeeded in 5 min 11 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #30734 succeeded in 1 min 20 sec
Details
@DeepDiver1975 DeepDiver1975 deleted the makeurltypeconfigurable branch Jan 8, 2016
@carlaschroder
Contributor

What are the exact options, 'public, 'internal' or 'admin'? Are there any others?

@carlaschroder
Contributor

And which oC versions does this apply to?

@MorrisJobke
Member

And which oC versions does this apply to?

bildschirmfoto 2016-01-08 um 18 26 38

8.2.3 ;) (see on the right sidebar)

@carlaschroder
Contributor

@MorrisJobke, bitter experience has taught me to not rely on the milestone :)

@MorrisJobke
Member

@MorrisJobke, bitter experience has taught me to not rely on the milestone :)

Okay :)

@carlaschroder carlaschroder referenced this pull request in owncloud/documentation Jan 8, 2016
Closed

[stable8.2] make swift url type configurable #21118 #2006

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