diff --git a/.gitreview b/.gitreview index 2986ae48a..222bc8a4a 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] host=review.openstack.org port=29418 -project=stackforge/tripleo-image-elements.git +project=openstack/tripleo-image-elements.git diff --git a/README.md b/README.md index fc671b198..4ca552bc5 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,11 @@ Instructions ------------ Checkout this source tree and also the diskimage builder -(https://github.com/stackforge/diskimage-builder), export an ELEMENTS\_PATH +(https://github.com/openstack/diskimage-builder), export an ELEMENTS\_PATH to add elements from this tree, and build any disk images you need. - git clone https://github.com/stackforge/diskimage-builder.git - git clone https://github.com/stackforge/tripleo-image-elements.git + git clone https://github.com/openstack/diskimage-builder.git + git clone https://github.com/openstack/tripleo-image-elements.git export ELEMENTS_PATH=tripleo-image-elements/elements diskimage-builder/bin/disk-image-create -u base vm bootstrap local-config stackuser heat-cfntools -a i386 -o bootstrap diff --git a/elements/apache2/README.md b/elements/apache2/README.md index e8bacd5be..ed75f72a9 100644 --- a/elements/apache2/README.md +++ b/elements/apache2/README.md @@ -10,4 +10,4 @@ The Snakeoil SSL cert can be configured via Heat Metadata. For example: snakeoil_key: ----- BEGIN PlaceHolder... Sample usage shown in nagios3 template at: - https://github.com/stackforge/tripleo-heat-templates \ No newline at end of file + https://github.com/openstack/tripleo-heat-templates diff --git a/elements/glance/os-config-applier/etc/glance/glance-api-paste.ini b/elements/glance/os-config-applier/etc/glance/glance-api-paste.ini index 0aa8f5cbc..9124b77af 100644 --- a/elements/glance/os-config-applier/etc/glance/glance-api-paste.ini +++ b/elements/glance/os-config-applier/etc/glance/glance-api-paste.ini @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder # Use this pipeline for no auth or image caching - DEFAULT [pipeline:glance-api] diff --git a/elements/glance/os-config-applier/etc/glance/glance-api.conf b/elements/glance/os-config-applier/etc/glance/glance-api.conf index fcbbb7668..090870860 100644 --- a/elements/glance/os-config-applier/etc/glance/glance-api.conf +++ b/elements/glance/os-config-applier/etc/glance/glance-api.conf @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [DEFAULT] debug = True diff --git a/elements/glance/os-config-applier/etc/glance/glance-cache.conf b/elements/glance/os-config-applier/etc/glance/glance-cache.conf index e9be08a20..0c5290319 100644 --- a/elements/glance/os-config-applier/etc/glance/glance-cache.conf +++ b/elements/glance/os-config-applier/etc/glance/glance-cache.conf @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [DEFAULT] log_file = /var/log/glance/image-cache.log diff --git a/elements/glance/os-config-applier/etc/glance/glance-registry-paste.ini b/elements/glance/os-config-applier/etc/glance/glance-registry-paste.ini index 91bb73d24..2fb5106ae 100644 --- a/elements/glance/os-config-applier/etc/glance/glance-registry-paste.ini +++ b/elements/glance/os-config-applier/etc/glance/glance-registry-paste.ini @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder # Use this pipeline for no auth - DEFAULT [pipeline:glance-registry] diff --git a/elements/glance/os-config-applier/etc/glance/glance-registry.conf b/elements/glance/os-config-applier/etc/glance/glance-registry.conf index 405b9cfb0..ca5fb94d9 100644 --- a/elements/glance/os-config-applier/etc/glance/glance-registry.conf +++ b/elements/glance/os-config-applier/etc/glance/glance-registry.conf @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [DEFAULT] bind_host = 0.0.0.0 diff --git a/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf b/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf index 8fb504970..26e412027 100644 --- a/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf +++ b/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [DEFAULT] # Show more verbose log output (sets INFO log level output) diff --git a/elements/glance/os-config-applier/etc/glance/logging.conf b/elements/glance/os-config-applier/etc/glance/logging.conf index 2cdac3121..c003e29dc 100644 --- a/elements/glance/os-config-applier/etc/glance/logging.conf +++ b/elements/glance/os-config-applier/etc/glance/logging.conf @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [loggers] keys=root,api,registry,combined diff --git a/elements/nagios3/README.md b/elements/nagios3/README.md index 7c9efb74c..75a93f816 100644 --- a/elements/nagios3/README.md +++ b/elements/nagios3/README.md @@ -20,4 +20,4 @@ can be provided via heat. For example: initial_network_split_key: ctlplane Sample heat template with defaults configured for a boot-stack vm located at: - https://github.com/stackforge/tripleo-heat-templates \ No newline at end of file + https://github.com/openstack/tripleo-heat-templates diff --git a/elements/neutron/os-config-applier/etc/neutron/api-paste.ini b/elements/neutron/os-config-applier/etc/neutron/api-paste.ini index 9fca167ae..77aabec90 100644 --- a/elements/neutron/os-config-applier/etc/neutron/api-paste.ini +++ b/elements/neutron/os-config-applier/etc/neutron/api-paste.ini @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [composite:neutron] use = egg:Paste#urlmap diff --git a/elements/neutron/os-config-applier/etc/neutron/dhcp_agent.ini b/elements/neutron/os-config-applier/etc/neutron/dhcp_agent.ini index 77eadd3f6..c86409808 100644 --- a/elements/neutron/os-config-applier/etc/neutron/dhcp_agent.ini +++ b/elements/neutron/os-config-applier/etc/neutron/dhcp_agent.ini @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [DEFAULT] debug = True diff --git a/elements/neutron/os-config-applier/etc/neutron/l3_agent.ini b/elements/neutron/os-config-applier/etc/neutron/l3_agent.ini index f40aeab22..97c7ce1b6 100644 --- a/elements/neutron/os-config-applier/etc/neutron/l3_agent.ini +++ b/elements/neutron/os-config-applier/etc/neutron/l3_agent.ini @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [DEFAULT] debug = True diff --git a/elements/neutron/os-config-applier/etc/neutron/neutron.conf b/elements/neutron/os-config-applier/etc/neutron/neutron.conf index 241bec8d4..9f9874c0e 100644 --- a/elements/neutron/os-config-applier/etc/neutron/neutron.conf +++ b/elements/neutron/os-config-applier/etc/neutron/neutron.conf @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [DEFAULT] debug = True diff --git a/elements/nova/os-apply-config/etc/nova/api-paste.ini b/elements/nova/os-apply-config/etc/nova/api-paste.ini index 02dc341ac..33fc16e3d 100644 --- a/elements/nova/os-apply-config/etc/nova/api-paste.ini +++ b/elements/nova/os-apply-config/etc/nova/api-paste.ini @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder ############ # Metadata # diff --git a/elements/nova/os-apply-config/etc/nova/logging.conf b/elements/nova/os-apply-config/etc/nova/logging.conf index f6accb3f5..94512e531 100644 --- a/elements/nova/os-apply-config/etc/nova/logging.conf +++ b/elements/nova/os-apply-config/etc/nova/logging.conf @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/diskimage-builder +## https://github.com/openstack/diskimage-builder [loggers] keys = root, nova diff --git a/elements/nova/os-apply-config/etc/nova/nova.conf b/elements/nova/os-apply-config/etc/nova/nova.conf index 808417b01..5541f787f 100644 --- a/elements/nova/os-apply-config/etc/nova/nova.conf +++ b/elements/nova/os-apply-config/etc/nova/nova.conf @@ -2,7 +2,7 @@ ## This config file was taken directly from the upstream repo, and tweaked just enough to work. ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. ## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://github.com/stackforge/tripleo-image-elements +## https://github.com/openstack/tripleo-image-elements [DEFAULT] diff --git a/elements/os-collect-config/source-repository-os-collect-config b/elements/os-collect-config/source-repository-os-collect-config index e3491f0fb..fd81c091c 100644 --- a/elements/os-collect-config/source-repository-os-collect-config +++ b/elements/os-collect-config/source-repository-os-collect-config @@ -1 +1 @@ -os-collect-config git /opt/stack/os-collect-config https://github.com/stackforge/os-collect-config.git +os-collect-config git /opt/stack/os-collect-config https://github.com/openstack/os-collect-config.git diff --git a/elements/os-refresh-config/source-repository-os-refresh-config b/elements/os-refresh-config/source-repository-os-refresh-config index 7ded6372d..9ae2d7ecd 100644 --- a/elements/os-refresh-config/source-repository-os-refresh-config +++ b/elements/os-refresh-config/source-repository-os-refresh-config @@ -1 +1 @@ -os-refresh-config git /opt/stack/os-refresh-config https://github.com/stackforge/os-refresh-config.git +os-refresh-config git /opt/stack/os-refresh-config https://github.com/openstack/os-refresh-config.git diff --git a/setup.cfg b/setup.cfg index 3507f5124..f95dea740 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ description-file = author = HP Cloud Services author_email = openstack-dev@lists.openstack.org license: Apache License (2.0) -home-page = https://github.com/stackforge/tripleo-image-elements +home-page = https://github.com/openstack/tripleo-image-elements classifier = Development Status :: 3 - Alpha License :: OSI Approved :: Apache Software License