Index: quickstart/__init__.py
=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py 2014-06-12 00:37:46 +0000
+++ quickstart/__init__.py 2014-06-17 16:07:50 +0000
@@ -45,7 +45,7 @@
Once Juju has been installed, the command can also be run as a juju plugin,
without the hyphen ("juju quickstart").
"""
-VERSION = (1, 3, 5)
+VERSION = (1, 4, 0)
def get_version():
Index: quickstart/models/envs.py
=== modified file 'quickstart/models/envs.py'
--- quickstart/models/envs.py 2014-06-16 10:00:00 +0000
+++ quickstart/models/envs.py 2014-06-17 16:07:50 +0000
@@ -419,8 +419,7 @@ 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2',
)
- hp_regions = (
- 'az-1.region-a.geo-1', 'az-2.region-a.geo-1', 'az-3.region-a.geo-1')
+ hp_regions = ('region-a.geo-1', 'region-b.geo-1')
azure_locations = (
'East US', 'West US', 'West Europe', 'North Europe', 'Southeast Asia', 'East Asia')
@@ -512,7 +511,8 @@ help='Specifies whether the use of a floating IP address
is ' 'required to give the nodes a public IP address. ' 'Some installations assign public IP addresses by '
- 'default without requiring a floating IP address.'),
+ 'default without requiring a floating IP address. '
+ 'For HP Public Cloud, floating IP must be
activated.'), fields.AutoGeneratedStringField( 'control-bucket', label='control bucket', required=False, help='the globally unique swift bucket name'),
@@ -526,7 +526,7 @@ 'tenant-name', label='tenant name', required=True, help='The OpenStack tenant name. For HP Public Cloud, this
is ' 'listed as the project name on the '
- 'https://account.hpcloud.com/projects page.'),
+ 'https://horizon.hpcloud.com/landing/ page.'), fields.SuggestionsStringField( 'region', label='region', required=True, help='The OpenStack region to use. '
@@ -538,15 +538,17 @@ help='The way Juju authenticates to OpenStack. The
userpass ' 'authentication requires you to fill in your user
name ' 'and password. The keypair mode requires access key
and '
- 'secret key to be properly set up. For HP Public
Cloud '
- 'these information can be retrieved on the '
- 'https://account.hpcloud.com/account/api_keys page.'),
+ 'secret key to be properly set up. For HP Public
Cloud, '
+ 'select userpass mode and type your HP Cloud login '
+ 'user name and password below.'), fields.StringField( 'username', label='user name', required=False,
- help='the user name to use for the userpass
authentication'),
+ help='the user name to use for the userpass
authentication '
+ '(or the HP Cloud login user name)'), fields.PasswordField( 'password', label='password', required=False,
- help='the user name to use for the userpass
authentication'),
+ help='the user name to use for the userpass
authentication '
+ '(or the HP Cloud login password)'), fields.StringField( 'access-key', label='access key', required=False, help='the access key to use for the keypair
authentication'),
@@ -603,7 +605,9 @@
'The joyent provider enables you to run Juju on the Joyent
cloud. '
'This process requires you to have a Joyent account. If you
have '
'not signed up for one yet, it can obtained at '
- 'http://www.joyent.com/.'
+ 'http://www.joyent.com/. See '
+ 'https://juju.ubuntu.com/docs/config-joyent.html for more
details '
+ 'on the joyent provider configuration.'
),
'fields': ( provider_field,
Reviewers: mp+223445_ code.launchpad. net,
Message:
Please take a look.
Description:
Align to the latest HP Cloud config options.
https:/ /code.launchpad .net/~frankban/ juju-quickstart /hp-fixes/ +merge/ 223445
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/105920046/
Affected files (+17, -11 lines): __init_ _.py models/ envs.py
A [revision details]
M quickstart/
M quickstart/
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: <email address hidden>
+New revision:
<email address hidden>
Index: quickstart/ __init_ _.py __init_ _.py' __init_ _.py 2014-06-12 00:37:46 +0000 __init_ _.py 2014-06-17 16:07:50 +0000
=== modified file 'quickstart/
--- quickstart/
+++ quickstart/
@@ -45,7 +45,7 @@
Once Juju has been installed, the command can also be run as a juju plugin,
without the hyphen ("juju quickstart").
"""
-VERSION = (1, 3, 5)
+VERSION = (1, 4, 0)
def get_version():
Index: quickstart/ models/ envs.py models/ envs.py' models/ envs.py 2014-06-16 10:00:00 +0000 models/ envs.py 2014-06-17 16:07:50 +0000
'eu- west-1' , 'sa-east-1',
'us- east-1' , 'us-west-1', 'us-west-2', a.geo-1' , 'az-2.region- a.geo-1' , 'az-3.region- a.geo-1' ) locations = (
'Southeast Asia', 'East Asia')
help= 'Specifies whether the use of a floating IP address
'required to give the nodes a public IP address. '
'Some installations assign public IP addresses by '
fields. AutoGeneratedSt ringField(
'control- bucket' , label='control bucket', required=False,
help= 'the globally unique swift bucket name'),
'tenant- name', label='tenant name', required=True,
help= 'The OpenStack tenant name. For HP Public Cloud, this
'listed as the project name on the ' /account. hpcloud. com/projects page.'), /horizon. hpcloud. com/landing/ page.'),
fields. SuggestionsStri ngField(
'region' , label='region', required=True,
help= 'The OpenStack region to use. '
help= 'The way Juju authenticates to OpenStack. The
'authenticati on requires you to fill in your user
'and password. The keypair mode requires access key /account. hpcloud. com/account/ api_keys page.'),
fields. StringField(
'username' , label='user name', required=False,
fields. PasswordField(
'password' , label='password', required=False,
fields. StringField(
'access- key', label='access key', required=False,
help= 'the access key to use for the keypair www.joyent. com/.' www.joyent. com/. See ' /juju.ubuntu. com/docs/ config- joyent. html for more
provider_ field,
=== modified file 'quickstart/
--- quickstart/
+++ quickstart/
@@ -419,8 +419,7 @@
)
- hp_regions = (
- 'az-1.region-
+ hp_regions = ('region-a.geo-1', 'region-b.geo-1')
azure_
'East US', 'West US', 'West Europe', 'North Europe',
@@ -512,7 +511,8 @@
is '
- 'default without requiring a floating IP address.'),
+ 'default without requiring a floating IP address. '
+ 'For HP Public Cloud, floating IP must be
activated.'),
@@ -526,7 +526,7 @@
is '
- 'https:/
+ 'https:/
@@ -538,15 +538,17 @@
userpass '
name '
and '
- 'secret key to be properly set up. For HP Public
Cloud '
- 'these information can be retrieved on the '
- 'https:/
+ 'secret key to be properly set up. For HP Public
Cloud, '
+ 'select userpass mode and type your HP Cloud login '
+ 'user name and password below.'),
- help='the user name to use for the userpass
authentication'),
+ help='the user name to use for the userpass
authentication '
+ '(or the HP Cloud login user name)'),
- help='the user name to use for the userpass
authentication'),
+ help='the user name to use for the userpass
authentication '
+ '(or the HP Cloud login password)'),
authentication'),
@@ -603,7 +605,9 @@
'The joyent provider enables you to run Juju on the Joyent
cloud. '
'This process requires you to have a Joyent account. If you
have '
'not signed up for one yet, it can obtained at '
- 'http://
+ 'http://
+ 'https:/
details '
+ 'on the joyent provider configuration.'
),
'fields': (