sademos

Merge lp:~cpe-sa/sademos/16.04-NCLXD-Config-Fixes into lp:sademos/16.04

  1. 16.04-NCLXD-Config-Fixes
  2. Merge into 16.04
Proposed by mahmoh
Status: Needs review
Proposed branch: lp:~cpe-sa/sademos/16.04-NCLXD-Config-Fixes
Merge into: lp:sademos/16.04
Diff against target: 49 lines (+6/-7)
2 files modified
openstack/nclxd/configure-openstack (+3/-4)
openstack/nclxd/nclxd.yaml (+3/-3)
To merge this branch: bzr merge lp:~cpe-sa/sademos/16.04-NCLXD-Config-Fixes
Reviewer Review Type Date Requested Status
CPE SA Pending
Review via email: mp+292683@code.launchpad.net

Description of the change

These changes fix the configure script to work properly on the v4n and with both Juju versions - please test and verify.

To post a comment you must log in.
Revision history for this message
mahmoh (mahmoh) wrote :

^the nclxd configure script, the others all need fixing.

Reply

Unmerged revisions

95. By mahmoh

Fixed configure NCLXD (only) script to work with juju 1.2x or 2.0; all the others need fixing too.

94. By mahmoh

NC-LXD fixes for ZFS support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openstack/nclxd/configure-openstack'
2--- openstack/nclxd/configure-openstack 2016-04-22 01:26:27 +0000
3+++ openstack/nclxd/configure-openstack 2016-04-22 20:05:21 +0000
4@@ -22,7 +22,7 @@
5 echo "This command is run to configure an Orange-Box Openstack deployment"
6
7 obnum=`hostname | cut -c 10- -`
8-external_net=`expr ${obnum} + 1`
9+external_net=`expr ${obnum} + 3`
10
11 #QUANTUM_EXT_NET_GW="172.27.${external_net}.254"
12 QUANTUM_EXT_NET_GW="172.27.${obnum}.1"
13@@ -35,9 +35,8 @@
14 QUANTUM_FIXED_NET_CIDR="192.168.14.0/22"
15 QUANTUM_FIXED_NET_NAME="admin_net"
16
17-#keystone=$(juju status keystone | grep public-address | head -1 | awk '{print $2}')
18-keystone1=$(juju status keystone |grep Unit|awk '{print $6}')
19-keystone=`echo $keystone1||tr '\n' ' '`
20+keystone_pre=$(juju status keystone --format tabular | grep keystone/0 | awk '{print $6}')
21+keystone=`echo $keystone_pre || tr '\n' ' '`
22
23 echo "export SERVICE_ENDPOINT=http://$keystone:35357/v2.0/
24 export SERVICE_TOKEN=admin
25
26=== modified file 'openstack/nclxd/nclxd.yaml'
27--- openstack/nclxd/nclxd.yaml 2016-04-22 00:18:27 +0000
28+++ openstack/nclxd/nclxd.yaml 2016-04-22 20:05:21 +0000
29@@ -1,7 +1,7 @@
30 series: xenial
31 services:
32 "rabbitmq-server":
33- charm: "cs:~openstack-charmers/xenial/rabbitmq-server"
34+ charm: "cs:~openstack-charmers-next/xenial/rabbitmq-server"
35 series: xenial
36 num_units: 1
37 annotations:
38@@ -13,9 +13,9 @@
39 charm: "cs:xenial/lxd"
40 series: xenial
41 options:
42- "block-device": /dev/sdb
43+ "block-devices": /dev/sdb
44 overwrite: true
45- "storage-type": lvm
46+ "storage-type": zfs
47 annotations:
48 "gui-x": "750"
49 "gui-y": "250"

Subscribers

People subscribed via source and target branches

to all changes: