From 026863674aaae91ba65dbd52d10c368f2fe35986 Mon Sep 17 00:00:00 2001
From: Fulvio Galeazzi <fulvio.galeazzi@gmail.com>
Date: Tue, 31 Oct 2017 13:09:01 +0000
Subject: [PATCH] 2017-10-31: FG; Last fixes: glance-api-version=2 and typo
in using variable os_internal_network.
---
bundles/openstack/bundle-config.cephlocal.yaml | 2 +-
bundles/openstack/bundle-config.yaml | 2 +-
bundles/openstack/bundle.allinone.yaml | 4 ++--
bundles/openstack/bundle.cephlocal.allinone.yaml | 4 ++--
bundles/openstack/bundle.cephlocal.yaml | 2 +-
bundles/openstack/bundle.yaml | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bundles/openstack/bundle-config.cephlocal.yaml b/bundles/openstack/bundle-config.cephlocal.yaml
index 359425ba..cce0da09 100644
--- a/bundles/openstack/bundle-config.cephlocal.yaml
+++ b/bundles/openstack/bundle-config.cephlocal.yaml
@@ -210,7 +210,7 @@ services:
compute-peer: *network_space_os_mgmt
neutron-plugin: *network_space_os_mgmt
options:
- os-internal-network: &os_internal_network
+ os-internal-network: *os_internal_network
nagios_context: *nagios_context
nova-cloud-controller:
diff --git a/bundles/openstack/bundle-config.yaml b/bundles/openstack/bundle-config.yaml
index d24d1398..df94c21a 100644
--- a/bundles/openstack/bundle-config.yaml
+++ b/bundles/openstack/bundle-config.yaml
@@ -211,7 +211,7 @@ services:
compute-peer: *network_space_os_mgmt
neutron-plugin: *network_space_os_mgmt
options:
- os-internal-network: &os_internal_network
+ os-internal-network: *os_internal_network
nagios_context: *nagios_context
nova-cloud-controller:
diff --git a/bundles/openstack/bundle.allinone.yaml b/bundles/openstack/bundle.allinone.yaml
index 60fb0997..65c3141a 100644
--- a/bundles/openstack/bundle.allinone.yaml
+++ b/bundles/openstack/bundle.allinone.yaml
@@ -494,7 +494,7 @@ services:
compute-peer: *network_space_os_mgmt
neutron-plugin: *network_space_os_mgmt
options:
- os-internal-network: &os_internal_network
+ os-internal-network: *os_internal_network
nagios_context: *nagios_context
openstack-origin: *openstack_origin
action-managed-upgrade: True
@@ -646,7 +646,7 @@ services:
openstack-origin: *openstack_origin
action-managed-upgrade: True
block-device: None
- glance-api-version: 3
+ glance-api-version: 2
nagios_servicegroups: ceph,block,storage
region: *region
use-syslog: True
diff --git a/bundles/openstack/bundle.cephlocal.allinone.yaml b/bundles/openstack/bundle.cephlocal.allinone.yaml
index 127592ca..9c4c26de 100644
--- a/bundles/openstack/bundle.cephlocal.allinone.yaml
+++ b/bundles/openstack/bundle.cephlocal.allinone.yaml
@@ -508,7 +508,7 @@ services:
compute-peer: *network_space_os_mgmt
neutron-plugin: *network_space_os_mgmt
options:
- os-internal-network: &os_internal_network
+ os-internal-network: *os_internal_network
nagios_context: *nagios_context
openstack-origin: *openstack_origin
action-managed-upgrade: True
@@ -661,7 +661,7 @@ services:
openstack-origin: *openstack_origin
action-managed-upgrade: True
block-device: None
- glance-api-version: 3
+ glance-api-version: 2
nagios_servicegroups: ceph,block,storage
region: *region
use-syslog: True
diff --git a/bundles/openstack/bundle.cephlocal.yaml b/bundles/openstack/bundle.cephlocal.yaml
index 8c6bdc35..d7f871eb 100644
--- a/bundles/openstack/bundle.cephlocal.yaml
+++ b/bundles/openstack/bundle.cephlocal.yaml
@@ -444,7 +444,7 @@ services:
openstack-origin: *openstack_origin
action-managed-upgrade: True
block-device: None
- glance-api-version: 3
+ glance-api-version: 2
nagios_servicegroups: ceph,block,storage
region: *region
use-syslog: True
diff --git a/bundles/openstack/bundle.yaml b/bundles/openstack/bundle.yaml
index 6c078edd..25ff8b76 100644
--- a/bundles/openstack/bundle.yaml
+++ b/bundles/openstack/bundle.yaml
@@ -428,7 +428,7 @@ services:
openstack-origin: *openstack_origin
action-managed-upgrade: True
block-device: None
- glance-api-version: 3
+ glance-api-version: 2
nagios_servicegroups: ceph,block,storage
region: *region
use-syslog: True
--
GitLab