Merge trunk
This commit is contained in:
Corey Bryant
commit
959450577a
150
README.md
150
README.md
@ -46,14 +46,16 @@ These compute nodes could then be accessed by cloud users via use of host aggreg
|
|||||||
|
|
||||||
The minimum openstack-origin-git config required to deploy from source is:
|
The minimum openstack-origin-git config required to deploy from source is:
|
||||||
|
|
||||||
openstack-origin-git:
|
openstack-origin-git: include-file://neutron-juno.yaml
|
||||||
"repositories:
|
|
||||||
- {name: requirements,
|
neutron-juno.yaml
|
||||||
repository: 'git://git.openstack.org/openstack/requirements',
|
repositories:
|
||||||
branch: stable/juno}
|
- {name: requirements,
|
||||||
- {name: neutron,
|
repository: 'git://github.com/openstack/requirements',
|
||||||
repository: 'git://git.openstack.org/openstack/neutron',
|
branch: stable/juno}
|
||||||
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'
|
Note that there are only two 'name' values the charm knows about: 'requirements'
|
||||||
and 'neutron'. These repositories must correspond to these 'name' values.
|
and 'neutron'. These repositories must correspond to these 'name' values.
|
||||||
@ -63,68 +65,70 @@ in the order in which they are specified.
|
|||||||
|
|
||||||
The following is a full list of current tip repos (may not be up-to-date):
|
The following is a full list of current tip repos (may not be up-to-date):
|
||||||
|
|
||||||
openstack-origin-git:
|
openstack-origin-git: include-file://neutron-master.yaml
|
||||||
"repositories:
|
|
||||||
- {name: requirements,
|
neutron-master.yaml
|
||||||
repository: 'git://git.openstack.org/openstack/requirements',
|
repositories:
|
||||||
branch: master}
|
- {name: requirements,
|
||||||
- {name: oslo-concurrency,
|
repository: 'git://github.com/openstack/requirements',
|
||||||
repository: 'git://git.openstack.org/openstack/oslo.concurrency',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-concurrency,
|
||||||
- {name: oslo-config,
|
repository: 'git://github.com/openstack/oslo.concurrency',
|
||||||
repository: 'git://git.openstack.org/openstack/oslo.config',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-config,
|
||||||
- {name: oslo-context,
|
repository: 'git://github.com/openstack/oslo.config',
|
||||||
repository: 'git://git.openstack.org/openstack/oslo.context.git',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-context,
|
||||||
- {name: oslo-db,
|
repository: 'git://github.com/openstack/oslo.context',
|
||||||
repository: 'git://git.openstack.org/openstack/oslo.db',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-db,
|
||||||
- {name: oslo-i18n,
|
repository: 'git://github.com/openstack/oslo.db',
|
||||||
repository: 'git://git.openstack.org/openstack/oslo.i18n',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-i18n,
|
||||||
- {name: oslo-messaging,
|
repository: 'git://github.com/openstack/oslo.i18n',
|
||||||
repository: 'git://git.openstack.org/openstack/oslo.messaging.git',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-messaging,
|
||||||
- {name: oslo-middleware,
|
repository: 'git://github.com/openstack/oslo.messaging',
|
||||||
repository': 'git://git.openstack.org/openstack/oslo.middleware.git',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-middleware,
|
||||||
- {name: oslo-rootwrap',
|
repository': 'git://github.com/openstack/oslo.middleware',
|
||||||
repository: 'git://git.openstack.org/openstack/oslo.rootwrap.git',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-rootwrap',
|
||||||
- {name: oslo-serialization,
|
repository: 'git://github.com/openstack/oslo.rootwrap',
|
||||||
repository: 'git://git.openstack.org/openstack/oslo.serialization',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-serialization,
|
||||||
- {name: oslo-utils,
|
repository: 'git://github.com/openstack/oslo.serialization',
|
||||||
repository: 'git://git.openstack.org/openstack/oslo.utils',
|
branch: master}
|
||||||
branch: master}
|
- {name: oslo-utils,
|
||||||
- {name: pbr,
|
repository: 'git://github.com/openstack/oslo.utils',
|
||||||
repository: 'git://git.openstack.org/openstack-dev/pbr',
|
branch: master}
|
||||||
branch: master}
|
- {name: pbr,
|
||||||
- {name: stevedore,
|
repository: 'git://github.com/openstack-dev/pbr',
|
||||||
repository: 'git://git.openstack.org/openstack/stevedore.git',
|
branch: master}
|
||||||
branch: 'master'}
|
- {name: stevedore,
|
||||||
- {name: python-keystoneclient,
|
repository: 'git://github.com/openstack/stevedore',
|
||||||
repository: 'git://git.openstack.org/openstack/python-keystoneclient',
|
branch: 'master'}
|
||||||
branch: master}
|
- {name: python-keystoneclient,
|
||||||
- {name: python-neutronclient,
|
repository: 'git://github.com/openstack/python-keystoneclient',
|
||||||
repository: 'git://git.openstack.org/openstack/python-neutronclient.git',
|
branch: master}
|
||||||
branch: master}
|
- {name: python-neutronclient,
|
||||||
- {name: python-novaclient,
|
repository: 'git://github.com/openstack/python-neutronclient',
|
||||||
repository': 'git://git.openstack.org/openstack/python-novaclient.git',
|
branch: master}
|
||||||
branch: master}
|
- {name: python-novaclient,
|
||||||
- {name: keystonemiddleware,
|
repository': 'git://github.com/openstack/python-novaclient',
|
||||||
repository: 'git://git.openstack.org/openstack/keystonemiddleware',
|
branch: master}
|
||||||
branch: master}
|
- {name: keystonemiddleware,
|
||||||
- {name: neutron-fwaas,
|
repository: 'git://github.com/openstack/keystonemiddleware',
|
||||||
repository': 'git://git.openstack.org/openstack/neutron-fwaas.git',
|
branch: master}
|
||||||
branch: master}
|
- {name: neutron-fwaas,
|
||||||
- {name: neutron-lbaas,
|
repository': 'git://github.com/openstack/neutron-fwaas',
|
||||||
repository: 'git://git.openstack.org/openstack/neutron-lbaas.git',
|
branch: master}
|
||||||
branch: master}
|
- {name: neutron-lbaas,
|
||||||
- {name: neutron-vpnaas,
|
repository: 'git://github.com/openstack/neutron-lbaas',
|
||||||
repository: 'git://git.openstack.org/openstack/neutron-vpnaas.git',
|
branch: master}
|
||||||
branch: master}
|
- {name: neutron-vpnaas,
|
||||||
- {name: neutron,
|
repository: 'git://github.com/openstack/neutron-vpnaas',
|
||||||
repository: 'git://git.openstack.org/openstack/neutron',
|
branch: master}
|
||||||
branch: master}"
|
- {name: neutron,
|
||||||
|
repository: 'git://github.com/openstack/neutron',
|
||||||
|
branch: master}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
description "Enabling Quantum external networking port"
|
description "Apply MTU for Neutron data ports"
|
||||||
|
|
||||||
start on runlevel [2345]
|
start on runlevel [2345]
|
||||||
|
|
||||||
@ -19,4 +19,4 @@ script
|
|||||||
rm $tmpfile
|
rm $tmpfile
|
||||||
[ $rc = 0 ] || exit $rc
|
[ $rc = 0 ] || exit $rc
|
||||||
fi
|
fi
|
||||||
end script
|
end script
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user