diff --git a/README.md b/README.md index 095003af..f9adbb6a 100644 --- a/README.md +++ b/README.md @@ -36,14 +36,16 @@ Deploying from source The minimum openstack-origin-git config required to deploy from source is: - openstack-origin-git: - "repositories: - - {name: requirements, - repository: 'git://git.openstack.org/openstack/requirements', - branch: stable/juno} - - {name: nova, - repository: 'git://git.openstack.org/openstack/nova', - branch: stable/juno}" + openstack-origin-git: include-file://nova-juno.yaml + + nova-juno.yaml + repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: stable/juno} + - {name: nova, + repository: 'git://github.com/openstack/nova', + branch: stable/juno} Note that there are only two 'name' values the charm knows about: 'requirements' and 'nova'. These repositories must correspond to these 'name' values. @@ -53,65 +55,67 @@ in the order in which they are specified. The following is a full list of current tip repos (may not be up-to-date): - openstack-origin-git: - "repositories: - - {name: requirements, - repository: 'git://git.openstack.org/openstack/requirements', - branch: master} - - {name: oslo-concurrency, - repository: 'git://git.openstack.org/openstack/oslo.concurrency', - branch: master} - - {name: oslo-config, - repository: 'git://git.openstack.org/openstack/oslo.config', - branch: master} - - {name: oslo-context, - repository: 'git://git.openstack.org/openstack/oslo.context.git', - branch: master} - - {name: oslo-db, - repository: 'git://git.openstack.org/openstack/oslo.db', - branch: master} - - {name: oslo-i18n, - repository: 'git://git.openstack.org/openstack/oslo.i18n', - branch: master} - - {name: oslo-log, - repository: 'git://git.openstack.org/openstack/oslo.log', - branch: master} - - {name: oslo-messaging, - repository: 'git://git.openstack.org/openstack/oslo.messaging.git', - branch: master} - - {name: oslo-middleware, - repository': 'git://git.openstack.org/openstack/oslo.middleware.git', - branch: master} - - {name: oslo-rootwrap', - repository: 'git://git.openstack.org/openstack/oslo.rootwrap.git', - branch: master} - - {name: oslo-serialization, - repository: 'git://git.openstack.org/openstack/oslo.serialization', - branch: master} - - {name: oslo-utils, - repository: 'git://git.openstack.org/openstack/oslo.utils', - branch: master} - - {name: pbr, - repository: 'git://git.openstack.org/openstack-dev/pbr', - branch: master} - - {name: stevedore, - repository: 'git://git.openstack.org/openstack/stevedore.git', - branch: 'master'} - - {name: sqlalchemy-migrate, - repository: 'git://git.openstack.org/stackforge/sqlalchemy-migrate', - branch: master} - - {name: python-cinderclient, - repository: 'git://git.openstack.org/openstack/python-cinderclient.git', - branch: master} - - {name: python-glanceclient, - repository': 'git://git.openstack.org/openstack/python-glanceclient.git', - branch: master} - - {name: python-neutronlient, - repository': 'git://git.openstack.org/openstack/python-neutronclient.git', - branch: master} - - {name: keystonemiddleware, - repository: 'git://git.openstack.org/openstack/keystonemiddleware', - branch: master} - - {name: nova, - repository: 'git://git.openstack.org/openstack/nova', - branch: master}" + openstack-origin-git: include-file://nova-master.yaml + + nova-master.yaml + repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: master} + - {name: oslo-concurrency, + repository: 'git://github.com/openstack/oslo.concurrency', + branch: master} + - {name: oslo-config, + repository: 'git://github.com/openstack/oslo.config', + branch: master} + - {name: oslo-context, + repository: 'git://github.com/openstack/oslo.context', + branch: master} + - {name: oslo-db, + repository: 'git://github.com/openstack/oslo.db', + branch: master} + - {name: oslo-i18n, + repository: 'git://github.com/openstack/oslo.i18n', + branch: master} + - {name: oslo-log, + repository: 'git://github.com/openstack/oslo.log', + branch: master} + - {name: oslo-messaging, + repository: 'git://github.com/openstack/oslo.messaging', + branch: master} + - {name: oslo-middleware, + repository': 'git://github.com/openstack/oslo.middleware', + branch: master} + - {name: oslo-rootwrap', + repository: 'git://github.com/openstack/oslo.rootwrap', + branch: master} + - {name: oslo-serialization, + repository: 'git://github.com/openstack/oslo.serialization', + branch: master} + - {name: oslo-utils, + repository: 'git://github.com/openstack/oslo.utils', + branch: master} + - {name: pbr, + repository: 'git://github.com/openstack-dev/pbr', + branch: master} + - {name: stevedore, + repository: 'git://github.com/openstack/stevedore', + branch: 'master'} + - {name: sqlalchemy-migrate, + repository: 'git://github.com/stackforge/sqlalchemy-migrate', + branch: master} + - {name: python-cinderclient, + repository: 'git://github.com/openstack/python-cinderclient', + branch: master} + - {name: python-glanceclient, + repository': 'git://github.com/openstack/python-glanceclient', + branch: master} + - {name: python-neutronlient, + repository': 'git://github.com/openstack/python-neutronclient', + branch: master} + - {name: keystonemiddleware, + repository: 'git://github.com/openstack/keystonemiddleware', + branch: master} + - {name: nova, + repository: 'git://github.com/openstack/nova', + branch: master}