openstack
/
instack-undercloud
Code Issues Proposed changes

Add cell_v2 simple_cell_setup 

The cell_v2 setup for Nova is becoming required in Ocata and is required
for upgrades. This change enables the cell0 setup as part of the
undercloud setup.

Change-Id: I9462ef16fd64a577c3f950bd121f0bd28670fabc
Depends-On: Idfc369e9e17f7d5a30ce4ff52beb604dd4a6ac23
Related-Bug: #1649341
This commit is contained in:
Alex Schultz 2016-12-16 16:05:43 -07:00
parent 479dd772c3
commit 4f17279900
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -3,6 +3,9 @@ keystone_auth_uri: {{UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC}}/v3
keystone_auth_uri_v2: {{UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC}}/v2.0
keystone_region: 'regionOne'
# default transport url for the (rabbit) messaging backend
undercloud_default_transport_url: "rabbit://{{UNDERCLOUD_RABBIT_USERNAME}}:{{UNDERCLOUD_RABBIT_PASSWORD}}@{{LOCAL_IP}}//"
debug: {{UNDERCLOUD_DEBUG}}
controller_host: {{LOCAL_IP}} #local-ipv4
controller_admin_vip: {{UNDERCLOUD_ADMIN_VIP}}
@ -343,7 +346,7 @@ gnocchi::statsd::archive_policy_name: 'low'
# Nova
nova::default_transport_url: "rabbit://{{UNDERCLOUD_RABBIT_USERNAME}}:{{UNDERCLOUD_RABBIT_PASSWORD}}@{{LOCAL_IP}}//"
nova::default_transport_url: "%{hiera('undercloud_default_transport_url')}"
nova::notification_driver: messaging
nova::rpc_response_timeout: '600'
nova::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
@ -403,6 +406,9 @@ nova::keystone::auth::configure_ec2_endpoint: false
nova::glance_api_servers: {{UNDERCLOUD_ENDPOINT_GLANCE_INTERNAL}}
nova::db::mysql_api::setup_cell0: true
nova::db::sync_cell_v2::transport_url: "%{hiera('undercloud_default_transport_url')}"
# Ironic
ironic::debug: "%{hiera('debug')}"
ironic::my_ip: {{LOCAL_IP}}