diff --git a/.prereqs b/.prereqs new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/.prereqs @@ -0,0 +1 @@ + diff --git a/files/glanceclient_pip_requires.txt b/files/glanceclient_pip_requires.txt new file mode 100644 index 0000000000..0a414664f6 --- /dev/null +++ b/files/glanceclient_pip_requires.txt @@ -0,0 +1,5 @@ +argparse +prettytable>=0.6,<0.7 +python-keystoneclient>=0.1.2 +pyOpenSSL +warlock>=0.7.0,<2 diff --git a/files/horizon_pip_requires.txt b/files/horizon_pip_requires.txt new file mode 100644 index 0000000000..756acbaec8 --- /dev/null +++ b/files/horizon_pip_requires.txt @@ -0,0 +1,11 @@ +Django>=1.4,<1.5 +django_compressor +django_openstack_auth +python-cinderclient +python-glanceclient<2 +python-keystoneclient +python-novaclient +python-quantumclient>=2.0 +python-swiftclient>1.1,<2 +pytz +lockfile # for SECURE_KEY generation diff --git a/files/horizon_settings.py b/files/horizon_settings.py index ce92e2c9e2..18f6d2d23c 100644 --- a/files/horizon_settings.py +++ b/files/horizon_settings.py @@ -7,6 +7,7 @@ PROD = False USE_SSL = False + # Set SSL proxy settings: # For Django 1.4+ pass this header from the proxy after terminating the SSL, # and don't forget to strip it from the client's request. @@ -80,8 +81,8 @@ # OPENSTACK_SSL_NO_VERIFY = True HORIZON_CONFIG = { - 'dashboards': ('project', 'admin', 'settings',), - 'default_dashboard': 'project', + 'dashboards': ('nova', 'syspanel', 'settings',), + 'default_dashboard': 'nova', } # The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the diff --git a/files/nova_pip_requires.txt b/files/nova_pip_requires.txt new file mode 100644 index 0000000000..00ef68a797 --- /dev/null +++ b/files/nova_pip_requires.txt @@ -0,0 +1,23 @@ +SQLAlchemy>=0.7.8,<=0.7.9 +Cheetah==2.4.4 +amqplib==0.6.1 +anyjson==0.2.4 +boto>=2.1.1 +eventlet>=0.9.17 +kombu==1.0.4 +lxml>=2.3,<=2.3.5 +routes==1.12.3 +WebOb==1.0.8 +greenlet>=0.3.1 +PasteDeploy==1.5.0 +paste +sqlalchemy-migrate>=0.7.2 +netaddr +suds==0.4 +paramiko +Babel>=0.9.6 +iso8601>=0.1.4 +httplib2 +setuptools_git>=0.4 +python-quantumclient>=2.1 +python-glanceclient>=0.5.0,<2 diff --git a/files/openstackclient_pip_requires.txt b/files/openstackclient_pip_requires.txt new file mode 100644 index 0000000000..83b56e9ee6 --- /dev/null +++ b/files/openstackclient_pip_requires.txt @@ -0,0 +1,7 @@ +cliff +keyring +pycrypto +python-glanceclient>=0.5.1 +python-keystoneclient>=0.2 +python-novaclient>=2 +python-cinderclient>=1 diff --git a/lib/glance b/lib/glance index 80d3902aab..1680ee7d3f 100644 --- a/lib/glance +++ b/lib/glance @@ -174,6 +174,10 @@ function init_glance() { # install_glanceclient() - Collect source and prepare function install_glanceclient() { git_clone $GLANCECLIENT_REPO $GLANCECLIENT_DIR $GLANCECLIENT_BRANCH + + #installs horizon requires.txt to fix coe breakage + glanceclient_requires=$GLANCECLIENT_DIR/tools/pip-requires + cp $FILES/glanceclient_pip_requires.txt $glanceclient_requires } # install_glance() - Collect source and prepare diff --git a/lib/horizon b/lib/horizon index 9180370b8d..9a6aac6437 100644 --- a/lib/horizon +++ b/lib/horizon @@ -128,6 +128,15 @@ function install_horizon() { fi git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG + + #installs horizon requires.txt to fix coe breakage + horizon_requires=$HORIZON_DIR/tools/pip-requires + cp $FILES/horizon_pip_requires.txt $horizon_requires + + + # ``local_settings.py`` is used to override horizon default settings. + local_settings=$HORIZON_DIR/openstack_dashboard/local/local_settings.py + cp $FILES/horizon_settings.py $local_settings } # start_horizon() - Start running processes, including screen diff --git a/lib/nova b/lib/nova index 849ec5730d..ae5c2bacf0 100644 --- a/lib/nova +++ b/lib/nova @@ -529,6 +529,10 @@ function install_nova() { fi git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH + + #installs horizon requires.txt to fix coe breakage + nova_requires=/opt/stack/nova/tools/pip-requires + cp $FILES/nova_pip_requires.txt $nova_requires } # start_nova_api() - Start the API process ahead of other things diff --git a/localrc b/localrc new file mode 100755 index 0000000000..b930441907 --- /dev/null +++ b/localrc @@ -0,0 +1,19 @@ +disable_service n-net +disable_service c-api +disable_service c-sch +disable_service c-vol +disable_service cinder +enable_service q-svc +enable_service q-agt +enable_service q-dhcp +enable_service q-l3 +enable_service q-meta +enable_service quantum +SCREEN_LOGDIR=/tmp +#optional +enable_service tempest +DATABASE_PASSWORD=password +RABBIT_PASSWORD=password +SERVICE_TOKEN=password +SERVICE_PASSWORD=password +ADMIN_PASSWORD=password diff --git a/stackrc b/stackrc index 008bc9c6b8..2101e8ffcd 100644 --- a/stackrc +++ b/stackrc @@ -38,49 +38,52 @@ SCREEN_DEV=True # Base GIT Repo URL # Another option is http://review.openstack.org/p -GIT_BASE=https://github.com +#GIT_BASE=https://github.com/openstack + +GIT_BASE=https://github.com/CiscoSystems +GIT_BRANCH=folsom # metering service -CEILOMETER_REPO=${GIT_BASE}/openstack/ceilometer.git +CEILOMETER_REPO=${GIT_BASE}/ceilometer.git CEILOMETER_BRANCH=master # ceilometer client library -CEILOMETERCLIENT_REPO=${GIT_BASE}/openstack/python-ceilometerclient +CEILOMETERCLIENT_REPO=${GIT_BASE}/python-ceilometerclient CEILOMETERCLIENT_BRANCH=master # volume service -CINDER_REPO=${GIT_BASE}/openstack/cinder +CINDER_REPO=https://github.com/openstack/cinder CINDER_BRANCH=master # volume client -CINDERCLIENT_REPO=${GIT_BASE}/openstack/python-cinderclient +CINDERCLIENT_REPO=https://github.com/openstack/python-cinderclient CINDERCLIENT_BRANCH=master # compute service -NOVA_REPO=${GIT_BASE}/openstack/nova.git -NOVA_BRANCH=master +NOVA_REPO=${GIT_BASE}/nova.git +NOVA_BRANCH=${GIT_BRANCH} # storage service -SWIFT_REPO=${GIT_BASE}/openstack/swift.git +SWIFT_REPO=${GIT_BASE}/swift.git SWIFT_BRANCH=master SWIFT3_REPO=https://github.com/fujita/swift3.git SWIFT3_BRANCH=master # python swift client library -SWIFTCLIENT_REPO=${GIT_BASE}/openstack/python-swiftclient -SWIFTCLIENT_BRANCH=master +SWIFTCLIENT_REPO=${GIT_BASE}/python-swiftclient +SWIFTCLIENT_BRANCH=${GIT_BRANCH} # image catalog service -GLANCE_REPO=${GIT_BASE}/openstack/glance.git +GLANCE_REPO=http://github.com/openstack/glance.git GLANCE_BRANCH=master # python glance client library -GLANCECLIENT_REPO=${GIT_BASE}/openstack/python-glanceclient +GLANCECLIENT_REPO=http://github.com/openstack/python-glanceclient GLANCECLIENT_BRANCH=master # unified auth system (manages accounts/tokens) -KEYSTONE_REPO=${GIT_BASE}/openstack/keystone.git -KEYSTONE_BRANCH=master +KEYSTONE_REPO=${GIT_BASE}/keystone.git +KEYSTONE_BRANCH=${GIT_BRANCH} # a websockets/html5 or flash powered VNC console for vm instances NOVNC_REPO=https://github.com/kanaka/noVNC.git @@ -91,39 +94,41 @@ SPICE_REPO=http://anongit.freedesktop.org/git/spice/spice-html5.git SPICE_BRANCH=master # django powered web control panel for openstack -HORIZON_REPO=${GIT_BASE}/openstack/horizon.git -HORIZON_BRANCH=master +HORIZON_REPO=http://github.com/CiscoSystems/horizon.git +HORIZON_BRANCH=${GIT_BRANCH} # python client library to nova that horizon (and others) use -NOVACLIENT_REPO=${GIT_BASE}/openstack/python-novaclient.git -NOVACLIENT_BRANCH=master +NOVACLIENT_REPO=${GIT_BASE}/python-novaclient.git +NOVACLIENT_BRANCH=${GIT_BRANCH} # consolidated openstack python client -OPENSTACKCLIENT_REPO=${GIT_BASE}/openstack/python-openstackclient.git +#OPENSTACKCLIENT_REPO=${GIT_BASE}/python-openstackclient.git +#OPENSTACKCLIENT_BRANCH=master +OPENSTACKCLIENT_REPO=http://github.com/openstack/python-openstackclient.git OPENSTACKCLIENT_BRANCH=master # python keystone client library to nova that horizon uses -KEYSTONECLIENT_REPO=${GIT_BASE}/openstack/python-keystoneclient -KEYSTONECLIENT_BRANCH=master +KEYSTONECLIENT_REPO=${GIT_BASE}/python-keystoneclient +KEYSTONECLIENT_BRANCH=${GIT_BRANCH} # quantum service -QUANTUM_REPO=${GIT_BASE}/openstack/quantum -QUANTUM_BRANCH=master +QUANTUM_REPO=${GIT_BASE}/quantum +QUANTUM_BRANCH=${GIT_BRANCH} # quantum client -QUANTUMCLIENT_REPO=${GIT_BASE}/openstack/python-quantumclient -QUANTUMCLIENT_BRANCH=master +QUANTUMCLIENT_REPO=${GIT_BASE}/python-quantumclient +QUANTUMCLIENT_BRANCH=${GIT_BRANCH} # Tempest test suite -TEMPEST_REPO=${GIT_BASE}/openstack/tempest.git -TEMPEST_BRANCH=master +TEMPEST_REPO=${GIT_BASE}/tempest.git +TEMPEST_BRANCH=${GIT_BRANCH} # heat service -HEAT_REPO=${GIT_BASE}/openstack/heat.git +HEAT_REPO=${GIT_BASE}/heat.git HEAT_BRANCH=master # python heat client library -HEATCLIENT_REPO=${GIT_BASE}/openstack/python-heatclient.git +HEATCLIENT_REPO=${GIT_BASE}/python-heatclient.git HEATCLIENT_BRANCH=master # ryu service