Merge lp:~axwalk/juju-core/lp1233924-azure-disable-daily-stream into lp:~go-bot/juju-core/trunk
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Andrew Wilkins | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 1923 | ||||
| Proposed branch: | lp:~axwalk/juju-core/lp1233924-azure-disable-daily-stream | ||||
| Merge into: | lp:~go-bot/juju-core/trunk | ||||
| Diff against target: | 0 lines | ||||
| To merge this branch: | bzr merge lp:~axwalk/juju-core/lp1233924-azure-disable-daily-stream | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Engineering | Pending | ||
|
Review via email:
|
|||
Commit message
provider/azure: remove default daily stream
The simplestreams.
being called with three datasources: storage,
daily and released. In our tests, storage was
empty, but daily and released were not; daily
did not, however, have any matching image ids.
There's an issue with simplestreams.
not attempting the next datasource if the
metadata index is valid, but does not contain
any matching product IDs.
Since the behaviour of simplestreams.
is potentially useful for private clouds, we
will just remove the daily stream from the defaults
for now. If people really want it, they can get
at it with image-stream and image-metadata-url.
Fixes #1233924
Description of the change
provider/azure: remove default daily stream
The simplestreams.
being called with three datasources: storage,
daily and released. In our tests, storage was
empty, but daily and released were not; daily
did not, however, have any matching image ids.
There's an issue with simplestreams.
not attempting the next datasource if the
metadata index is valid, but does not contain
any matching product IDs.
Since the behaviour of simplestreams.
is potentially useful for private clouds, we
will just remove the daily stream from the defaults
for now. If people really want it, they can get
at it with image-stream and image-metadata-url.
Fixes #1233924
| Andrew Wilkins (axwalk) wrote | # |
| John A Meinel (jameinel) wrote | # |
| Andrew Wilkins (axwalk) wrote | # |
| Go Bot (go-bot) wrote | # |
| Go Bot (go-bot) wrote | # |
Reviewers: mp+188777_
Message:
Please take a look.
Description:
provider/azure: remove default daily stream
The simplestreams.
being called with three datasources: storage,
daily and released. In our tests, storage was
empty, but daily and released were not; daily
did not, however, have any matching image ids.
There's an issue with simplestreams.
not attempting the next datasource if the
metadata index is valid, but does not contain
any matching product IDs.
Since the behaviour of simplestreams.
is potentially useful for private clouds, we
will just remove the daily stream from the defaults
for now. If people really want it, they can get
at it with image-stream and image-metadata-url.
Fixes #1233924
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files (+7, -3 lines):
A [revision details]
M provider/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: provider/
=== modified file 'provider/
--- provider/
+++ provider/
@@ -900,9 +900,11 @@
// It contains the central databases for the released and daily streams,
but this may
// become more configurable. This variable is here as a placeholder, but
also
// as an injection point for tests.
-var baseURLs = []string{
- "http://
-}
+//
+// XXX Due to datasource fallback issues, the default daily stream has
been removed.
+// This var now only serves as an injection point for tests. See also:
+// https:/
+var baseURLs = []string{}
// GetImageSources returns a list of sources which are used to search for
simplestreams image metadata.
func (env *azureEnviron) GetImageSources() ([]simplestream
error) {