opendev/system-config
Code Issues Proposed changes

Merge "Revert "Reduce hpcloud-b1 and b2 usage to 0""

Browse Source
This commit is contained in:
Jenkins 2014-09-09 22:19:53 +00:00 committed by Gerrit Code Review
commit a0f3dff658
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/templates/nodepool/nodepool.yaml.erb
View File

@ -430,7 +430,7 @@ providers:
project-id: '<%= hpcloud_project %>' project-id: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 120 boot-timeout: 120
max-servers: 0 max-servers: 100
networks: networks:
- net-id: b6596f90-914a-41e9-b01a-223d90b86e8d - net-id: b6596f90-914a-41e9-b01a-223d90b86e8d
availability-zones: availability-zones:
@ -494,7 +494,7 @@ providers:
project-id: '<%= hpcloud_project %>' project-id: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 120 boot-timeout: 120
max-servers: 0 max-servers: 100
networks: networks:
- net-id: 90169672-ad5a-4fd5-a1b6-af121203f95c - net-id: 90169672-ad5a-4fd5-a1b6-af121203f95c
availability-zones: availability-zones:
@ -558,7 +558,7 @@ providers:
project-id: '<%= hpcloud_project %>' project-id: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 120 boot-timeout: 120
max-servers: 166 max-servers: 100
networks: networks:
- net-id: 63657422-b84f-4d2d-b7d2-765ac560546b - net-id: 63657422-b84f-4d2d-b7d2-765ac560546b
availability-zones: availability-zones:
@ -622,7 +622,7 @@ providers:
project-id: '<%= hpcloud_project %>' project-id: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 120 boot-timeout: 120
max-servers: 166 max-servers: 100
networks: networks:
- net-id: f6d0d957-f31d-4e3b-9c07-3d2a4feebc03 - net-id: f6d0d957-f31d-4e3b-9c07-3d2a4feebc03
availability-zones: availability-zones:
@ -687,7 +687,7 @@ providers:
project-id: '<%= hpcloud_project %>' project-id: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 120 boot-timeout: 120
max-servers: 166 max-servers: 100
networks: networks:
- net-id: b96c212f-16e1-4b9c-a3d2-09b3871220c2 - net-id: b96c212f-16e1-4b9c-a3d2-09b3871220c2
availability-zones: availability-zones: