diff --git a/doc/source/devstack-gate.rst b/doc/source/devstack-gate.rst index 47df525cfc..f698157a85 100644 --- a/doc/source/devstack-gate.rst +++ b/doc/source/devstack-gate.rst @@ -37,7 +37,7 @@ integration test and ensures that a proposed change still enables several of the projects to work together. Any proposed change to the configured set of projects must pass the devstack gate test: -Obviously we test nova, glance, keystone, horizon, quantum and their +Obviously we test nova, glance, keystone, horizon, neutron and their clients because they all work closely together to form an OpenStack system. Changes to devstack itself are also required to pass this test so that we can be assured that devstack is always able to produce a diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index f91978fe6e..0e9dd33eba 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -54,10 +54,10 @@ openstack-dev: - openstack/python-keystoneclient - openstack/python-novaclient - openstack/python-openstackclient - - openstack/python-quantumclient + - openstack/python-neutronclient - openstack/python-swiftclient - openstack/python-troveclient - - openstack/quantum + - openstack/neutron - openstack/swift - openstack/tempest - openstack/trove @@ -154,14 +154,14 @@ heat: branches: - master -openstack-quantum: +openstack-neutron: events: - patchset-created - change-merged - x-vrif-minus-2 projects: - - openstack/quantum - - openstack/python-quantumclient + - openstack/neutron + - openstack/python-neutronclient branches: - master diff --git a/modules/launchpad_sync/files/update_gerrit_users.py b/modules/launchpad_sync/files/update_gerrit_users.py index e8724b920f..baa748270d 100755 --- a/modules/launchpad_sync/files/update_gerrit_users.py +++ b/modules/launchpad_sync/files/update_gerrit_users.py @@ -270,9 +270,9 @@ class Sync(object): 'openstack/python-melangeclient', 'openstack/python-novaclient', 'openstack/python-openstackclient', - 'openstack/python-quantumclient', + 'openstack/python-neutronclient', 'openstack/python-swiftclient', - 'openstack/quantum', + 'openstack/neutron', 'openstack/requirements', 'openstack/swift', 'openstack/tempest', diff --git a/modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config b/modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config index 36d6d75abc..4e8c1243a2 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config @@ -1,8 +1,8 @@ [access] inheritFrom = API-Projects [access "refs/heads/*"] - label-Code-Review = -2..+2 group quantum-core - label-Approved = +0..+1 group quantum-core + label-Code-Review = -2..+2 group neutron-core + label-Approved = +0..+1 group neutron-core [project] state = active [receive] diff --git a/modules/openstack_project/files/gerrit/acls/openstack/neutron.config b/modules/openstack_project/files/gerrit/acls/openstack/neutron.config new file mode 100644 index 0000000000..f781b56b51 --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack/neutron.config @@ -0,0 +1,13 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group neutron-core + label-Approved = +0..+1 group neutron-core +[access "refs/heads/milestone-proposed"] + label-Code-Review = -2..+2 group neutron-milestone + label-Approved = +0..+1 group neutron-milestone +[project] + state = active +[receive] + requireChangeId = true + requireContributorAgreement = true +[submit] + mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-neutronclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-neutronclient.config new file mode 100644 index 0000000000..1a53092809 --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-neutronclient.config @@ -0,0 +1,16 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group neutron-core + label-Approved = +0..+1 group neutron-core +[access "refs/heads/milestone-proposed"] + label-Code-Review = -2..+2 group neutron-milestone + label-Approved = +0..+1 group neutron-milestone +[access "refs/tags/*"] + create = group neutron-ptl + pushTag = group neutron-ptl +[project] + state = active +[receive] + requireChangeId = true + requireContributorAgreement = true +[submit] + mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-quantumclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-quantumclient.config deleted file mode 100644 index 187a540738..0000000000 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-quantumclient.config +++ /dev/null @@ -1,16 +0,0 @@ -[access "refs/heads/*"] - label-Code-Review = -2..+2 group quantum-core - label-Approved = +0..+1 group quantum-core -[access "refs/heads/milestone-proposed"] - label-Code-Review = -2..+2 group quantum-milestone - label-Approved = +0..+1 group quantum-milestone -[access "refs/tags/*"] - create = group quantum-ptl - pushTag = group quantum-ptl -[project] - state = active -[receive] - requireChangeId = true - requireContributorAgreement = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack/quantum.config b/modules/openstack_project/files/gerrit/acls/openstack/quantum.config deleted file mode 100644 index 5359b1052d..0000000000 --- a/modules/openstack_project/files/gerrit/acls/openstack/quantum.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] - label-Code-Review = -2..+2 group quantum-core - label-Approved = +0..+1 group quantum-core -[access "refs/heads/milestone-proposed"] - label-Code-Review = -2..+2 group quantum-milestone - label-Approved = +0..+1 group quantum-milestone -[project] - state = active -[receive] - requireChangeId = true - requireContributorAgreement = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 0963a76e0c..4d2c348682 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -100,7 +100,7 @@ - job: - name: gate-tempest-devstack-vm-quantum + name: gate-tempest-devstack-vm-neutron node: devstack-precise wrappers: @@ -122,7 +122,7 @@ #!/bin/bash -xe export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_QUANTUM=1 + export DEVSTACK_GATE_NEUTRON=1 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -134,7 +134,7 @@ - job: - name: gate-tempest-devstack-vm-quantum-full + name: gate-tempest-devstack-vm-neutron-full node: devstack-precise wrappers: @@ -157,7 +157,7 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_QUANTUM=1 + export DEVSTACK_GATE_NEUTRON=1 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -325,7 +325,7 @@ - job: - name: periodic-tempest-devstack-vm-quantum-stable-grizzly + name: periodic-tempest-devstack-vm-neutron-stable-grizzly node: devstack-precise wrappers: @@ -350,7 +350,7 @@ #!/bin/bash -xe export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_QUANTUM=1 + export DEVSTACK_GATE_NEUTRON=1 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 1c8cb8d2ac..271ce9c582 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -596,7 +596,7 @@ - project: - name: python-quantumclient + name: python-neutronclient github-org: openstack node: precise tarball-site: tarballs.openstack.org @@ -622,7 +622,7 @@ - project: - name: quantum + name: neutron github-org: openstack node: precise tarball-site: tarballs.openstack.org diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml index ed9e19837b..5b2fdf2633 100644 --- a/modules/openstack_project/files/zuul/layout-dev.yaml +++ b/modules/openstack_project/files/zuul/layout-dev.yaml @@ -18,9 +18,9 @@ jobs: branch: stable/folsom - name: gate-tempest-devstack-vm-full branch: ^(?!stable/folsom).*$ - - name: gate-tempest-devstack-vm-quantum + - name: gate-tempest-devstack-vm-neutron branch: ^(?!stable/folsom).*$ - - name: gate-tempest-devstack-vm-quantum-full + - name: gate-tempest-devstack-vm-neutron-full branch: ^(?!stable/(folsom|grizzly)).*$ voting: false - name: gate-tempest-devstack-vm-postgres-full @@ -163,7 +163,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack/glance @@ -177,7 +177,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack/horizon @@ -192,7 +192,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack/keystone @@ -206,7 +206,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack/nova @@ -220,7 +220,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - gate-nova-pylint @@ -249,14 +249,14 @@ projects: - gate-oslo.messaging-python26 - gate-oslo.messaging-python27 - - name: openstack/quantum + - name: openstack/neutron check: - - gate-quantum-requirements - - gate-quantum-pep8 - - gate-quantum-docs - - gate-quantum-python26 - - gate-quantum-python27 - - gate-tempest-devstack-vm-quantum + - gate-neutron-requirements + - gate-neutron-pep8 + - gate-neutron-docs + - gate-neutron-python26 + - gate-neutron-python27 + - gate-tempest-devstack-vm-neutron - name: openstack/swift check: @@ -268,7 +268,7 @@ projects: - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-tempest-devstack-vm-postgres-full - gate-grenade-devstack-vm @@ -291,7 +291,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack/python-glanceclient @@ -305,7 +305,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack/python-keystoneclient @@ -319,7 +319,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack/python-novaclient @@ -333,7 +333,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack/python-openstackclient @@ -344,18 +344,18 @@ projects: - gate-python-openstackclient-python26 - gate-python-openstackclient-python27 - - name: openstack/python-quantumclient + - name: openstack/python-neutronclient check: - - gate-python-quantumclient-requirements - - gate-python-quantumclient-pep8 - - gate-python-quantumclient-docs - - gate-python-quantumclient-python26 - - gate-python-quantumclient-python27 + - gate-python-neutronclient-requirements + - gate-python-neutronclient-pep8 + - gate-python-neutronclient-docs + - gate-python-neutronclient-python26 + - gate-python-neutronclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack/python-swiftclient @@ -395,7 +395,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack-infra/devstack-gate @@ -404,7 +404,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: z/tempest @@ -417,8 +417,8 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum - - gate-tempest-devstack-vm-quantum-full + - gate-tempest-devstack-vm-neutron + - gate-tempest-devstack-vm-neutron-full - name: openstack/ceilometer check: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 95759c9248..07d6857a63 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -70,9 +70,9 @@ jobs: branch: stable/folsom - name: gate-tempest-devstack-vm-full branch: ^(?!stable/folsom).*$ - - name: gate-tempest-devstack-vm-quantum + - name: gate-tempest-devstack-vm-neutron branch: ^(?!stable/folsom).*$ - - name: gate-tempest-devstack-vm-quantum-full + - name: gate-tempest-devstack-vm-neutron-full branch: ^(?!stable/(folsom|grizzly)).*$ voting: false - name: gate-tempest-devstack-vm-postgres-full @@ -361,7 +361,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-cinder-requirements @@ -373,7 +373,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - cinder-branch-tarball @@ -397,7 +397,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-glance-requirements @@ -409,7 +409,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - glance-branch-tarball @@ -434,7 +434,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-horizon-requirements @@ -448,7 +448,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - horizon-branch-tarball @@ -471,7 +471,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-keystone-requirements @@ -483,7 +483,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - keystone-branch-tarball @@ -508,7 +508,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - gate-nova-pylint gate: @@ -521,7 +521,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - nova-branch-tarball @@ -615,31 +615,31 @@ projects: - oslo.sphinx-tarball: - oslo.sphinx-pypi-upload - - name: openstack/quantum + - name: openstack/neutron check: - - gate-quantum-requirements - - gate-quantum-pep8 - - gate-quantum-docs - - gate-quantum-python26 - - gate-quantum-python27 - - gate-tempest-devstack-vm-quantum + - gate-neutron-requirements + - gate-neutron-pep8 + - gate-neutron-docs + - gate-neutron-python26 + - gate-neutron-python27 + - gate-tempest-devstack-vm-neutron gate: - - gate-quantum-requirements - - gate-quantum-docs - - gate-quantum-pep8 - - gate-quantum-python26 - - gate-quantum-python27 - - gate-tempest-devstack-vm-quantum + - gate-neutron-requirements + - gate-neutron-docs + - gate-neutron-pep8 + - gate-neutron-python26 + - gate-neutron-python27 + - gate-tempest-devstack-vm-neutron post: - - quantum-branch-tarball - - quantum-coverage - - quantum-docs - - quantum-upstream-translation-update + - neutron-branch-tarball + - neutron-coverage + - neutron-docs + - neutron-upstream-translation-update pre-release: - - quantum-tarball + - neutron-tarball release: - - quantum-tarball - - quantum-docs + - neutron-tarball + - neutron-docs - name: openstack/swift check: @@ -651,7 +651,7 @@ projects: - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-tempest-devstack-vm-postgres-full - gate-grenade-devstack-vm gate: @@ -663,7 +663,7 @@ projects: - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-tempest-devstack-vm-postgres-full - gate-grenade-devstack-vm post: @@ -710,7 +710,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-python-cinderclient-requirements @@ -722,7 +722,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - python-cinderclient-branch-tarball @@ -745,7 +745,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-python-glanceclient-requirements @@ -757,7 +757,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - python-glanceclient-branch-tarball @@ -780,7 +780,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-python-keystoneclient-requirements @@ -792,7 +792,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - python-keystoneclient-branch-tarball @@ -815,7 +815,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-python-novaclient-requirements @@ -827,7 +827,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - python-novaclient-branch-tarball @@ -862,40 +862,40 @@ projects: - python-openstackclient-pypi-upload - python-openstackclient-docs - - name: openstack/python-quantumclient + - name: openstack/python-neutronclient check: - - gate-python-quantumclient-requirements - - gate-python-quantumclient-pep8 - - gate-python-quantumclient-docs - - gate-python-quantumclient-python26 - - gate-python-quantumclient-python27 + - gate-python-neutronclient-requirements + - gate-python-neutronclient-pep8 + - gate-python-neutronclient-docs + - gate-python-neutronclient-python26 + - gate-python-neutronclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - - gate-python-quantumclient-requirements - - gate-python-quantumclient-docs - - gate-python-quantumclient-pep8 - - gate-python-quantumclient-python26 - - gate-python-quantumclient-python27 + - gate-python-neutronclient-requirements + - gate-python-neutronclient-docs + - gate-python-neutronclient-pep8 + - gate-python-neutronclient-python26 + - gate-python-neutronclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - - python-quantumclient-branch-tarball - - python-quantumclient-coverage + - python-neutronclient-branch-tarball + - python-neutronclient-coverage pre-release: - - python-quantumclient-tarball + - python-neutronclient-tarball release: - - python-quantumclient-tarball: - - python-quantumclient-pypi-upload - - python-quantumclient-docs + - python-neutronclient-tarball: + - python-neutronclient-pypi-upload + - python-neutronclient-docs - name: openstack/python-swiftclient check: @@ -972,7 +972,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-pbr-docs @@ -984,7 +984,7 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm post: - pbr-branch-tarball @@ -1004,14 +1004,14 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm - name: openstack-infra/devstack-gate @@ -1020,19 +1020,19 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm # This is not strictly necessary; there is currently a transitive # relationship between g-t-devstack-vm, - # g-t-devstack-vm-{postgres,cinder,quantum} and g-t-devstack-vm-full + # g-t-devstack-vm-{postgres,cinder,neutron} and g-t-devstack-vm-full # that will ensure that these projects end up in the same shared # change queue, however, this fake project makes it explicit that # g-t-devstack-vm and g-t-devstack-vm-full must share a change @@ -1046,7 +1046,7 @@ projects: - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum-full + - gate-tempest-devstack-vm-neutron-full - name: openstack/tempest check: @@ -1057,8 +1057,8 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum - - gate-tempest-devstack-vm-quantum-full + - gate-tempest-devstack-vm-neutron + - gate-tempest-devstack-vm-neutron-full gate: - gate-tempest-requirements - gate-tempest-pep8 @@ -1067,8 +1067,8 @@ projects: - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-cinder - - gate-tempest-devstack-vm-quantum - - gate-tempest-devstack-vm-quantum-full + - gate-tempest-devstack-vm-neutron + - gate-tempest-devstack-vm-neutron-full post: - tempest-docs @@ -1141,7 +1141,7 @@ projects: - gate-heat-python27 - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron gate: - gate-heat-requirements - gate-heat-pep8 @@ -1149,7 +1149,7 @@ projects: - gate-heat-python27 - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - - gate-tempest-devstack-vm-quantum + - gate-tempest-devstack-vm-neutron post: - heat-branch-tarball - heat-coverage diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index d225ee1f95..2cab53df22 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -77,7 +77,7 @@ class openstack_project::gerrit ( 'openstack/keystone', 'openstack/nova', 'openstack/oslo', - 'openstack/quantum', + 'openstack/neutron', 'openstack/swift', 'openstack/tempest', 'openstack-dev/devstack', diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index 0cc0cb9eae..4865fc7076 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -108,9 +108,9 @@ - project: openstack/python-keystoneclient - project: openstack/python-novaclient - project: openstack/python-openstackclient -- project: openstack/python-quantumclient +- project: openstack/python-neutronclient - project: openstack/python-swiftclient -- project: openstack/quantum +- project: openstack/neutron - project: openstack/requirements - project: openstack/swift - project: openstack/tempest