From 54743ba775afc028ba6ef3057ab208939c08ba6d Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Thu, 30 Apr 2015 12:09:22 +0000 Subject: [PATCH] [corey.bryant,trivial] Update deploy from source README samples. --- README.md | 150 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index c351340f..0632f8b1 100644 --- a/README.md +++ b/README.md @@ -27,14 +27,16 @@ This charm also supports scale out and high availability using the hacluster cha 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: neutron, - repository: 'git://git.openstack.org/openstack/neutron', - branch: stable/juno}" + openstack-origin-git: include-file://neutron-juno.yaml + + neutron-juno.yaml + repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: stable/juno} + - {name: neutron, + repository: 'git://github.com/openstack/neutron', + branch: stable/juno} Note that there are only two 'name' values the charm knows about: 'requirements' and 'neutron'. These repositories must correspond to these 'name' values. @@ -44,71 +46,73 @@ 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-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: python-keystoneclient, - repository: 'git://git.openstack.org/openstack/python-keystoneclient', - branch: master} - - {name: python-neutronclient, - repository: 'git://git.openstack.org/openstack/python-neutronclient.git', - branch: master} - - {name: python-novaclient, - repository': 'git://git.openstack.org/openstack/python-novaclient.git', - branch: master} - - {name: keystonemiddleware, - repository: 'git://git.openstack.org/openstack/keystonemiddleware', - branch: master} - - {name: neutron-fwaas, - repository': 'git://git.openstack.org/openstack/neutron-fwaas.git', - branch: master} - - {name: neutron-lbaas, - repository: 'git://git.openstack.org/openstack/neutron-lbaas.git', - branch: master} - - {name: neutron-vpnaas, - repository: 'git://git.openstack.org/openstack/neutron-vpnaas.git', - branch: master} - - {name: neutron, - repository: 'git://git.openstack.org/openstack/neutron', - branch: master}" + openstack-origin-git: include-file://neutron-master.yaml + + neutron-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-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: python-keystoneclient, + repository: 'git://github.com/openstack/python-keystoneclient', + branch: master} + - {name: python-neutronclient, + repository: 'git://github.com/openstack/python-neutronclient', + branch: master} + - {name: python-novaclient, + repository': 'git://github.com/openstack/python-novaclient', + branch: master} + - {name: keystonemiddleware, + repository: 'git://github.com/openstack/keystonemiddleware', + branch: master} + - {name: neutron-fwaas, + repository': 'git://github.com/openstack/neutron-fwaas', + branch: master} + - {name: neutron-lbaas, + repository: 'git://github.com/openstack/neutron-lbaas', + branch: master} + - {name: neutron-vpnaas, + repository: 'git://github.com/openstack/neutron-vpnaas', + branch: master} + - {name: neutron, + repository: 'git://github.com/openstack/neutron', + branch: master} # Restrictions