summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/specs/k8-odl-coe.rst105
-rw-r--r--xci/installer/osa/files/ansible-role-requirements.yml82
-rw-r--r--xci/installer/osa/files/openstack_services.yml78
-rwxr-xr-xxci/scripts/update-osa-version-files.sh4
4 files changed, 185 insertions, 84 deletions
diff --git a/docs/specs/k8-odl-coe.rst b/docs/specs/k8-odl-coe.rst
new file mode 100644
index 00000000..cd29456c
--- /dev/null
+++ b/docs/specs/k8-odl-coe.rst
@@ -0,0 +1,105 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. SPDX-License-Identifier: CC-BY-4.0
+.. Copyright 2018 Ericsson AB and Others
+
+.. Links
+.. _OpenDaylight COE: https://wiki.opendaylight.org/view/COE:Main
+.. _setting-up-coe-dev-environment: https://github.com/opendaylight/coe/blob/master/docs/setting-up-coe-dev-environment.rst
+.. _ansible-opendaylight: https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging/ansible-opendaylight.git;a=tree
+
+This spec proposes adding an k8-odl-coe XCI scenario for OpenDaylight as the
+networking provider for Kubernetes using the OpenDaylight COE (Container
+Orchestration Engine) and NetVirt projects.
+
+Problem Description
+===================
+
+Currently OpenDaylight's advanced networking capabilities are not leveraged
+with Kubernetes in any scenarios. This spec proposes a reference platform for
+deployments that want to use OpenDaylight as a networking backend for
+Kubernetes.
+
+Minimum Hardware Requirements
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Hardware for Kubernetes Master Node(s)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* RAM: 16 GB (20 GB for ha flavor i.e. for OpenDaylight Clustering)
+* HD: 80 GB
+* vCores: 6
+
+Hardware for Kubernetes Worker Node(s)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* RAM: 12 GB
+* HD: 80 GB
+* vCores: 6
+
+Supported XCI Sandbox Flavors
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This scenario will support deployments on Mini, No HA and HA XCI Sandbox Flavors.
+
+Proposed Change
+===============
+
+1. Provide Pod Descriptor Files (PDF) and IDF (Installer Descriptor Files)
+ specific to this scenario to install Kubernetes with OpenDaylight COE.
+2. Introduce a new scenario k8-odl-coe in releng-xci-scenarios repository.
+3. Reuse the role from k8-nosdn-nofeature scenario to install Kubernetes.
+ It has kube_network_plugin option to 'cloud' in k8s-cluster.yml so that
+ Kubespray doesn't configure networking between pods. This enables
+ OpenDaylight to be chosen as a networking backend in steps 4-7.
+4. Enhance upstream `ansible-opendaylight`_ role to deploy OpenDaylight with
+ COE Watcher on k8s master node(s) and CNI plugin on the k8s master and
+ worker node(s).
+5. Add the required Ansible tasks in k8-odl-coe role to direct XCI and
+ ansible-opendaylight role to configure k8s with OpenDaylight as the
+ networking backend for pod connectivity.
+6. Run the Health Check by testing the pods' connectivity.
+
+The COE Watcher binary and COE CNI plugin are built from OpenDaylight COE
+source code. The user will have flexibility to choose its SHA from XCI's
+ansible-role-requirements.yml file.
+
+Code Impact
+-----------
+
+Code specific to the k8-odl-coe scenario will be added to the xci/scenarios
+directory of the releng-xci-scenarios repository.
+
+User Guide
+----------
+
+No user guide will be provided.
+
+Implementation
+==============
+
+See the Proposed Change section.
+
+Assignee(s)
+-----------
+
+Primary assignees:
+
+* Prem Sankar G (premsa)
+* Periyasamy Palanisamy (epalper)
+* Fatih Degirmenci (fdegir)
+
+Work Items
+----------
+
+1. Enhance the akka.conf.j2 in upstream ansible-opendaylight role to work
+ with k8s deployments (i.e. run ODL cluster on k8s master nodes).
+ Currently this works only for the deployments based on Openstack-Ansible.
+2. Enhance upstream ansible-opendaylight role to install odl-netvirt-coe and
+ odl-restconf Karaf features, build COE watcher and CNI plugin binaries
+ from source.
+3. Implement configure-kubenet.yml to choose OpenDaylight COE as the
+ networking backend.
+4. Implement Health Check tests.
+
+Glossary
+--------
diff --git a/xci/installer/osa/files/ansible-role-requirements.yml b/xci/installer/osa/files/ansible-role-requirements.yml
index b000bce4..f24e5103 100644
--- a/xci/installer/osa/files/ansible-role-requirements.yml
+++ b/xci/installer/osa/files/ansible-role-requirements.yml
@@ -8,34 +8,34 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# these versions are based on the osa commit 85714acedb50ea65d7e7684c127984c8dc56afe4 on 2018-04-03
-# http://github.com/cgit/openstack/openstack-ansible/commit/?id=90d0679d209cb494b9a71817c56e2c26c7fc5ca1
+# https://git.openstack.org/cgit/openstack/openstack-ansible/commit/?id=90d0679d209cb494b9a71817c56e2c26c7fc5ca1
- name: ansible-hardening
scm: git
- src: https://github.com/openstack/ansible-hardening
+ src: https://git.openstack.org/openstack/ansible-hardening
version: 3f870c24f9bcd88ec1f1d7815c30cf2abfac39e5
- name: apt_package_pinning
scm: git
- src: https://github.com/openstack/openstack-ansible-apt_package_pinning
+ src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
version: b488ec5ee3092ba5b6765b5888c9ad2e44922ec5
- name: pip_install
scm: git
- src: https://github.com/openstack/openstack-ansible-pip_install
+ src: https://git.openstack.org/openstack/openstack-ansible-pip_install
version: 78e615c712771e33c1a7436e05bc91644318ece1
- name: galera_client
scm: git
- src: https://github.com/openstack/openstack-ansible-galera_client
+ src: https://git.openstack.org/openstack/openstack-ansible-galera_client
version: 4bc75a7b141fa0ff0ff1f35d26c09163df482b34
- name: galera_server
scm: git
- src: https://github.com/openstack/openstack-ansible-galera_server
+ src: https://git.openstack.org/openstack/openstack-ansible-galera_server
version: 9b2c2e8098f0f02e206c0498fa466a6798f7c89d
- name: ceph_client
scm: git
- src: https://github.com/openstack/openstack-ansible-ceph_client
+ src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
version: 50ea8b644c0713d007f6f172cd7bbc850f44a55a
- name: haproxy_server
scm: git
- src: https://github.com/openstack/openstack-ansible-haproxy_server
+ src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
version: 0c0c9453e8760fcbb0a126e6c97de83f004ae06b
- name: keepalived
scm: git
@@ -43,136 +43,136 @@
version: 2b4a1f36c29b06b832bc4e6d112ca5559a98fd4a
- name: lxc_container_create
scm: git
- src: https://github.com/openstack/openstack-ansible-lxc_container_create
+ src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
version: 3d1e70d1be8d10a54da35ad97c3e750384f8a73b
- name: lxc_hosts
scm: git
- src: https://github.com/openstack/openstack-ansible-lxc_hosts
+ src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
version: e77c3a923bc8aae4a264917f592b58b5d1c79aed
- name: memcached_server
scm: git
- src: https://github.com/openstack/openstack-ansible-memcached_server
+ src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
version: 67ff6cd34d8158dde56a7a59b8ccbdd079effde5
- name: openstack_hosts
scm: git
- src: https://github.com/openstack/openstack-ansible-openstack_hosts
+ src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
version: 372be6bfc1169131c6607c4f0f5758563dc1265f
- name: os_keystone
scm: git
- src: https://github.com/openstack/openstack-ansible-os_keystone
+ src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
version: 48019740f86570f8bcb14068a0e253b05ffb4336
- name: openstack_openrc
scm: git
- src: https://github.com/openstack/openstack-ansible-openstack_openrc
+ src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
version: e86c73ef9af547b30a4aab0d39aca96359bf5ce4
- name: os_aodh
scm: git
- src: https://github.com/openstack/openstack-ansible-os_aodh
+ src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
version: 75c8a1f07c0b0f8e8baa68198be789efd453183e
- name: os_barbican
scm: git
- src: https://github.com/openstack/openstack-ansible-os_barbican
+ src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
version: bd8b72cb68c2629f3d1c032f315eb9c25931920e
- name: os_ceilometer
scm: git
- src: https://github.com/openstack/openstack-ansible-os_ceilometer
+ src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
version: c9b2115cf7c38a5861a8126d45eddef9ea03d1ad
- name: os_cinder
scm: git
- src: https://github.com/openstack/openstack-ansible-os_cinder
+ src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
version: 948305aa6bfeeb2abdda7351aa0a8ff292810e56
- name: os_designate
scm: git
- src: https://github.com/openstack/openstack-ansible-os_designate
+ src: https://git.openstack.org/openstack/openstack-ansible-os_designate
version: b1a08cc7e897e5b600415a69280a64f8f61dd66c
- name: os_glance
scm: git
- src: https://github.com/openstack/openstack-ansible-os_glance
+ src: https://git.openstack.org/openstack/openstack-ansible-os_glance
version: 9f2aa6478dadab3a4ec0cee6d23ffc86fa76a99b
- name: os_gnocchi
scm: git
- src: https://github.com/openstack/openstack-ansible-os_gnocchi
+ src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
version: 5beb9ca451812959f09c9f9235eee529c42b3805
- name: os_heat
scm: git
- src: https://github.com/openstack/openstack-ansible-os_heat
+ src: https://git.openstack.org/openstack/openstack-ansible-os_heat
version: 7eff32af7fae96096694d582589389c66d10a8a3
- name: os_horizon
scm: git
- src: https://github.com/openstack/openstack-ansible-os_horizon
+ src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
version: ea9a27931e6d7f22df23ea02e1c0938ba576fada
- name: os_ironic
scm: git
- src: https://github.com/openstack/openstack-ansible-os_ironic
+ src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
version: 8c33498070489e2ff645cc1286df535e2b16726b
- name: os_magnum
scm: git
- src: https://github.com/openstack/openstack-ansible-os_magnum
+ src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
version: 06087d8d193f4985ed8c33e996b02fa717628c27
- name: os_molteniron
scm: git
- src: https://github.com/openstack/openstack-ansible-os_molteniron
+ src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
version: 5102381790218c390438011f64e763016d335c61
- name: os_neutron
scm: git
- src: https://github.com/openstack/openstack-ansible-os_neutron
+ src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
version: 4bbb681632f2d577585905982d81fa019332f993
- name: os_nova
scm: git
- src: https://github.com/openstack/openstack-ansible-os_nova
+ src: https://git.openstack.org/openstack/openstack-ansible-os_nova
version: d104fb16bdc349382fd05265ff9e19b6b0133fac
refspec: refs/changes/17/572417/1
- name: os_octavia
scm: git
- src: https://github.com/openstack/openstack-ansible-os_octavia
+ src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
version: c4cdbc5f36c43591cf729a5ce0f2a1e605c30be0
- name: os_rally
scm: git
- src: https://github.com/openstack/openstack-ansible-os_rally
+ src: https://git.openstack.org/openstack/openstack-ansible-os_rally
version: 083bbb8c1290506797d49c51ee91a344a481d25c
- name: os_sahara
scm: git
- src: https://github.com/openstack/openstack-ansible-os_sahara
+ src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
version: 9b5111884ebd64ec8088bbdfb3b9a58cdabf1edb
- name: os_swift
scm: git
- src: https://github.com/openstack/openstack-ansible-os_swift
+ src: https://git.openstack.org/openstack/openstack-ansible-os_swift
version: 5e88210fdd42d40960a14767fc662b3bd8a73c8a
- name: os_tacker
scm: git
- src: https://github.com/openstack/openstack-ansible-os_tacker
+ src: https://git.openstack.org/openstack/openstack-ansible-os_tacker
version: d4acca1ce9ec3ce0c599a3424fa3c92ee318d270
- name: os_tempest
scm: git
- src: https://github.com/openstack/openstack-ansible-os_tempest
+ src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
version: f34582d887e8e26e99710b29ac35306938ca857c
- name: os_trove
scm: git
- src: https://github.com/openstack/openstack-ansible-os_trove
+ src: https://git.openstack.org/openstack/openstack-ansible-os_trove
version: 6cd21b625d9f3da5c537e98064f67001173c9174
- name: plugins
scm: git
- src: https://github.com/openstack/openstack-ansible-plugins
+ src: https://git.openstack.org/openstack/openstack-ansible-plugins
version: e1f330786d5f09bb02c3f06b3484a089223419ad
- name: rabbitmq_server
scm: git
- src: https://github.com/openstack/openstack-ansible-rabbitmq_server
+ src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
version: cffd1ebd45e20331ee505568cd34c277d3225138
- name: repo_build
scm: git
- src: https://github.com/openstack/openstack-ansible-repo_build
+ src: https://git.openstack.org/openstack/openstack-ansible-repo_build
version: a84d11ab04c911c788b534cd61d33e6e2b71dd0b
- name: repo_server
scm: git
- src: https://github.com/openstack/openstack-ansible-repo_server
+ src: https://git.openstack.org/openstack/openstack-ansible-repo_server
version: 5979a638eade8523f113714f9fd5c0fb59353277
- name: rsyslog_client
scm: git
- src: https://github.com/openstack/openstack-ansible-rsyslog_client
+ src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
version: ed8e178c38a28cab87b8d9bd4396caccf8c0e790
- name: rsyslog_server
scm: git
- src: https://github.com/openstack/openstack-ansible-rsyslog_server
+ src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
version: d401a62d2f8ff7c8e6924b6fae0086e47ab37fa6
- name: sshd
scm: git
diff --git a/xci/installer/osa/files/openstack_services.yml b/xci/installer/osa/files/openstack_services.yml
index 95abec5c..f8a2a95b 100644
--- a/xci/installer/osa/files/openstack_services.yml
+++ b/xci/installer/osa/files/openstack_services.yml
@@ -30,211 +30,211 @@
## Global Requirements
-requirements_git_repo: https://github.com/openstack/requirements
+requirements_git_repo: https://git.openstack.org/openstack/requirements
requirements_git_install_branch: 207ac2e166f0874b7ff891535bdb78ecf36cabc6 # HEAD of "stable/queens" as of 01.03.2018
## Aodh service
-aodh_git_repo: https://github.com/openstack/aodh
+aodh_git_repo: https://git.openstack.org/openstack/aodh
aodh_git_install_branch: f549faea0ea19dad5bb3f1871b7d66ae5d9d80f2 # HEAD of "stable/queens" as of 01.03.2018
aodh_git_project_group: aodh_all
## Barbican service
-barbican_git_repo: https://github.com/openstack/barbican
+barbican_git_repo: https://git.openstack.org/openstack/barbican
barbican_git_install_branch: 5b525f6b0a7cf5342a9ffa3ca3618028d6d53649 # HEAD of "stable/queens" as of 01.03.2018
barbican_git_project_group: barbican_all
## Ceilometer service
-ceilometer_git_repo: https://github.com/openstack/ceilometer
+ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
ceilometer_git_install_branch: 24caac82528be7678165bf12fb5b997852727ecd # HEAD of "stable/queens" as of 01.03.2018
ceilometer_git_project_group: ceilometer_all
## Cinder service
-cinder_git_repo: https://github.com/openstack/cinder
+cinder_git_repo: https://git.openstack.org/openstack/cinder
cinder_git_install_branch: b61a02de56c1b9cc6d5003b5304ce66ee930f37b # HEAD of "stable/queens" as of 01.03.2018
cinder_git_project_group: cinder_all
## Designate service
-designate_git_repo: https://github.com/openstack/designate
+designate_git_repo: https://git.openstack.org/openstack/designate
designate_git_install_branch: 6ca9446bdcf04ba80787348892937cf19eefbf5a # HEAD of "stable/queens" as of 01.03.2018
designate_git_project_group: designate_all
## Horizon Designate dashboard plugin
-designate_dashboard_git_repo: https://github.com/openstack/designate-dashboard
+designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard
designate_dashboard_git_install_branch: 5570a2dd51ccd3750012bfde9991f0689a02323b # HEAD of "stable/queens" as of 01.03.2018
designate_dashboard_git_project_group: horizon_all
## Dragonflow service
-dragonflow_git_repo: https://github.com/openstack/dragonflow
+dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
dragonflow_git_install_branch: a2f50a8e8222ae1de04e44a6fd6f7e00d5864fc0 # HEAD of "master" as of 01.03.2018
dragonflow_git_project_group: neutron_all
## Glance service
-glance_git_repo: https://github.com/openstack/glance
+glance_git_repo: https://git.openstack.org/openstack/glance
glance_git_install_branch: 968f4ae9ce244d9372cb3e8f45acea9d557f317d # HEAD of "stable/queens" as of 01.03.2018
glance_git_project_group: glance_all
## Heat service
-heat_git_repo: https://github.com/openstack/heat
+heat_git_repo: https://git.openstack.org/openstack/heat
heat_git_install_branch: 43f122be13736f15fbc38cb6e6ce29545f784c86 # HEAD of "stable/queens" as of 01.03.2018
heat_git_project_group: heat_all
## Horizon service
-horizon_git_repo: https://github.com/openstack/horizon
+horizon_git_repo: https://git.openstack.org/openstack/horizon
horizon_git_install_branch: d017fde2a0fdc48e4687f0f5ae0362ba6c5ad66a # HEAD of "stable/queens" as of 01.03.2018
horizon_git_project_group: horizon_all
## Horizon Ironic dashboard plugin
-ironic_dashboard_git_repo: https://github.com/openstack/ironic-ui
+ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui
ironic_dashboard_git_install_branch: 1c4cbd2b90270f65d04b91ddc5f86efa35bbc622 # HEAD of "stable/queens" as of 01.03.2018
ironic_dashboard_git_project_group: horizon_all
## Horizon Magnum dashboard plugin
-magnum_dashboard_git_repo: https://github.com/openstack/magnum-ui
+magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui
magnum_dashboard_git_install_branch: 051408e5b86615f74e5fa4cd2e4284b6d1e6a3f2 # HEAD of "stable/queens" as of 01.03.2018
magnum_dashboard_git_project_group: horizon_all
## Horizon LBaaS dashboard plugin
-neutron_lbaas_dashboard_git_repo: https://github.com/openstack/neutron-lbaas-dashboard
+neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard
neutron_lbaas_dashboard_git_install_branch: a42434a21bf95566472dc6c8ce078ca84432423d # HEAD of "stable/queens" as of 01.03.2018
neutron_lbaas_dashboard_git_project_group: horizon_all
## Horizon FWaaS dashboard plugin
-neutron_fwaas_dashboard_git_repo: https://github.com//openstack/neutron-fwaas-dashboard
+neutron_fwaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-fwaas-dashboard
neutron_fwaas_dashboard_git_install_branch: a710e7c4f48afe0261ef25efc44088346124de1c # HEAD of "stable/queens" as of 01.03.2018
neutron_fwaas_dashboard_git_project_group: horizon_all
## Horizon Sahara dashboard plugin
-sahara_dashboard_git_repo: https://github.com/openstack/sahara-dashboard
+sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard
sahara_dashboard_git_install_branch: 707059ff4e372ae66b21b82050a9e16295176782 # HEAD of "stable/queens" as of 01.03.2018
sahara_dashboard_git_project_group: horizon_all
## Keystone service
-keystone_git_repo: https://github.com/openstack/keystone
+keystone_git_repo: https://git.openstack.org/openstack/keystone
keystone_git_install_branch: c06d74fcf4cf5338db6572265c609036f6817466 # HEAD of "stable/queens" as of 01.03.2018
keystone_git_project_group: keystone_all
## Neutron service
-neutron_git_repo: https://github.com/openstack/neutron
+neutron_git_repo: https://git.openstack.org/openstack/neutron
neutron_git_install_branch: abb60c6175af435964028ce7c97bb4803aeab004 # HEAD of "stable/queens" as of 01.03.2018
neutron_git_project_group: neutron_all
-neutron_lbaas_git_repo: https://github.com/openstack/neutron-lbaas
+neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
neutron_lbaas_git_install_branch: f6b8b5b0ad2c19ddf6a7c102c706cbfdb0b2bf05 # HEAD of "stable/queens" as of 01.03.2018
neutron_lbaas_git_project_group: neutron_all
-neutron_vpnaas_git_repo: https://github.com/openstack/neutron-vpnaas
+neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: 8b01dcabb456d2d0bdf905b23f0bdb3ff2530f4d # HEAD of "stable/queens" as of 01.03.2018
neutron_vpnaas_git_project_group: neutron_all
-neutron_fwaas_git_repo: https://github.com/openstack/neutron-fwaas
+neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
neutron_fwaas_git_install_branch: 43f56b794b19bb0f362e1d0a1449ee24bb16156e # HEAD of "stable/queens" as of 01.03.2018
neutron_fwaas_git_project_group: neutron_all
-neutron_dynamic_routing_git_repo: https://github.com/openstack/neutron-dynamic-routing
+neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing
neutron_dynamic_routing_git_install_branch: 386b5e4c33ab765eb7a72e9a9d4ffc1524d7d0c8 # HEAD of "stable/queens" as of 01.03.2018
neutron_dynamic_routing_git_project_group: neutron_all
-networking_calico_git_repo: https://github.com/openstack/networking-calico
+networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
networking_calico_git_install_branch: 10626324b597585cc781197133d4b12f890b8081 # HEAD of "master" as of 01.03.2018
networking_calico_git_project_group: neutron_all
-networking_odl_git_repo: https://github.com/openstack/networking-odl
+networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl
networking_odl_git_install_branch: 8733cf68cbc827a4dd458e3328b5fd2c23a07bcf # HEAD of "stable/queens" as of 01.03.2018
networking_odl_git_project_group: neutron_all
-networking_bgpvpn_git_repo: https://github.com/openstack/networking-bgpvpn
+networking_bgpvpn_git_repo: https://git.openstack.org/openstack/networking-bgpvpn
networking_bgpvpn_git_install_branch: a15c091d8a616c1fd1d3741f32c5d135b5db594f # HEAD of "stable/queens" as of 01.03.2018
networking_bgpvpn_git_project_group: neutron_all
-networking_sfc_git_repo: https://github.com/openstack/networking-sfc
+networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc
networking_sfc_git_install_branch: cbb68837a38428766ed4d22c5adfe3b2bc6c5f99 # HEAD of "stable/queens" as of 01.03.2018
networking_sfc_git_project_group: neutron_all
## Nova service
-nova_git_repo: https://github.com/openstack/nova
+nova_git_repo: https://git.openstack.org/openstack/nova
nova_git_install_branch: 5039511840bd64151f3111d9c8d7d8a01344193b # HEAD of "stable/queens" as of 01.03.2018
nova_git_project_group: nova_all
## PowerVM Virt Driver
-nova_powervm_git_repo: https://github.com/openstack/nova-powervm
+nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm
nova_powervm_git_install_branch: 2999bff2d0e651cc091757d0501f82af2691daf6 # HEAD of "stable/queens" as of 01.03.2018
nova_powervm_git_project_group: nova_all
## LXD Virt Driver
-nova_lxd_git_repo: https://github.com/openstack/nova-lxd
+nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
nova_lxd_git_install_branch: 01b6a8e07558678505e3fa2b6f9ea2d10f821642 # HEAD of "stable/queens" as of 01.03.2018
nova_lxd_git_project_group: nova_all
## Sahara service
-sahara_git_repo: https://github.com/openstack/sahara
+sahara_git_repo: https://git.openstack.org/openstack/sahara
sahara_git_install_branch: abcc07a70f2da288548aa96abb16c8380e46dcf9 # HEAD of "stable/queens" as of 01.03.2018
sahara_git_project_group: sahara_all
## Swift service
-swift_git_repo: https://github.com/openstack/swift
+swift_git_repo: https://git.openstack.org/openstack/swift
swift_git_install_branch: bd4b3c5dc9256fc0d6cca8f925705740c2395efd # HEAD of "stable/queens" as of 01.03.2018
swift_git_project_group: swift_all
## Swift3 middleware
-swift_swift3_git_repo: https://github.com/openstack/swift3
+swift_swift3_git_repo: https://git.openstack.org/openstack/swift3
swift_swift3_git_install_branch: 1c117c96dda8113c3398c16e68b61efef397de74 # HEAD of "master" as of 01.03.2018
swift_swift3_git_project_group: swift_all
## Ironic service
-ironic_git_repo: https://github.com/openstack/ironic
+ironic_git_repo: https://git.openstack.org/openstack/ironic
ironic_git_install_branch: 4c3a611ac3803a17dd584eb319f0bb40d6ee5ba3 # HEAD of "stable/queens" as of 01.03.2018
ironic_git_project_group: ironic_all
## Magnum service
-magnum_git_repo: https://github.com/openstack/magnum
+magnum_git_repo: https://git.openstack.org/openstack/magnum
magnum_git_install_branch: 0b3133280fd7dbde65c8581b7be03cd1e3686bc4 # HEAD of "stable/queens" as of 01.03.2018
magnum_git_project_group: magnum_all
## Trove service
-trove_git_repo: https://github.com/openstack/trove
+trove_git_repo: https://git.openstack.org/openstack/trove
trove_git_install_branch: 43d2b96f86a5365d69c885738ea1c3642f4e5aa1 # HEAD of "stable/queens" as of 01.03.2018
trove_git_project_group: trove_all
## Horizon Trove dashboard plugin
-trove_dashboard_git_repo: https://github.com/openstack/trove-dashboard
+trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard
trove_dashboard_git_install_branch: f7cf9d5bbe8b04fc9ea95e79b9bec21842d324f9 # HEAD of "stable/queens" as of 01.03.2018
trove_dashboard_git_project_group: horizon_all
## Octavia service
-octavia_git_repo: https://github.com/openstack/octavia
+octavia_git_repo: https://git.openstack.org/openstack/octavia
octavia_git_install_branch: 9f379aef7c0665d4183ac549ed7a0dbc0e5d3aca # HEAD of "stable/queens" as of 01.03.2018
octavia_git_project_group: octavia_all
## Molteniron service
-molteniron_git_repo: https://github.com/openstack/molteniron
+molteniron_git_repo: https://git.openstack.org/openstack/molteniron
molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 01.03.2018
molteniron_git_project_group: molteniron_all
## Tacker service
-tacker_git_repo: https://github.com/openstack/tacker
+tacker_git_repo: https://git.openstack.org/openstack/tacker
tacker_git_install_branch: 6932f5642598d53d93f94514eaed55cc93ea19d7 # HEAD of "stable/queens" as of 01.03.2018
tacker_git_project_group: tacker_all
diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh
index bb15fcba..42405a3f 100755
--- a/xci/scripts/update-osa-version-files.sh
+++ b/xci/scripts/update-osa-version-files.sh
@@ -96,10 +96,6 @@ fi
cp $tempdir/openstack-ansible/playbooks/defaults/repo_packages/openstack_services.yml ${releng_xci_base}/installer/osa/files/.
cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/installer/osa/files/.
-# Switch sources from git.openstack.org to github.com
-sed -i "s@^src:.*git\.openstack\.org/\(.*\)@src: https://github\.com/\1@g" ${releng_xci_base}/installer/osa/files/ansible-role-requirements.yml
-sed -i "s@\(^.*git_repo:\).*git\.openstack\.org/\(.*\)@\1 https://github\.com/\2@g" ${releng_xci_base}/installer/osa/files/openstack_services.yml
-
popd &> /dev/null
printme ""