sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
osdomname=`grep "os-domain-name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
if [ "$osdomname" != "''" ]; then
+ sed --i "s@#use-internal-endpoints: true@use-internal-endpoints: true@g" ./bundles.yaml
+ sed --i "s@#endpoint-type: internalURL@endpoint-type: internalURL@g" ./bundles.yaml
sed --i "s@#os-public-hostname: pod.maas@os-public-hostname: api.$osdomname@g" ./bundles.yaml
sed --i "s@#console-proxy-ip: pod.maas@console-proxy-ip: $osdomname@g" ./bundles.yaml
fi
#ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
- use-internal-endpoints: true
+ #use-internal-endpoints: true
#os-public-hostname: pod.maas
trusty-mitaka:
secret: admin
webroot: /
vip: 10.4.1.11
- endpoint-type: internalURL
+ #endpoint-type: internalURL
to:
- "lxc:nodes=3"
- "lxc:nodes=4"
# vim: set ts=2 et:
trusty-mitaka-nodes:
inherits: openstack-phase1
-
-trusty-mitaka:
- inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
#ceph-cluster-network: 10.4.0.0/21
#ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
- use-internal-endpoints: true
+ #use-internal-endpoints: true
#os-public-hostname: pod.maas
+trusty-mitaka:
+ inherits: openstack-phase2
+
openstack-phase1:
services:
nodes:
charm: local:trusty/openstack-dashboard
num_units: 3
options:
- endpoint-type: internalURL
+ #endpoint-type: internalURL
secret: admin
vip: 10.4.1.11
webroot: /
# vim: set ts=2 et:
trusty-mitaka-nodes:
inherits: openstack-phase1
-
-trusty-mitaka:
- inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
#ceph-cluster-network: 10.4.0.0/21
#ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
- use-internal-endpoints: true
+ #use-internal-endpoints: true
#os-public-hostname: pod.maas
+trusty-mitaka:
+ inherits: openstack-phase2
+
openstack-phase1:
services:
nodes:
secret: admin
vip: 10.4.1.11
webroot: /
- endpoint-type: internalURL
+ #endpoint-type: internalURL
to:
- "lxc:nodes=2"
- "lxc:nodes=3"