modified to fix the orange pod issue regarding glance where ceph

was on data network rather than admin network.

Change-Id: I2940aae3a34cad843372036c4815e692d822af84
(cherry picked from commit ed9bdc677f6be57776cc1c8939c841ed9dae11a4)

7 files changed, 111 insertions, 79 deletions

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 29a04af2..f22bd535 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -31,28 +31,28 @@ openstack-phase2:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
     ceph:
       branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
-      num_units: 2
+      num_units: 3
       options:
-        monitor-count: 1
+        monitor-count: 3
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
-        osd-reformat: 'yes'
+        osd-devices: ""
+#        osd-reformat: 'yes'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
+        - "lxc:nodes-api=2"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
     ceph-osd:
       branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
-      num_units: 3
+      num_units: 2
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-api=0"
-        - "nodes-api=1"
-        - "nodes-api=2"
+        - "nodes-compute=0"
+        - "nodes-compute=1"
     ceph-radosgw:
       branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
       num_units: 1
@@ -324,6 +324,7 @@ trusty-liberty:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-liberty"
@@ -342,6 +343,7 @@ trusty-kilo:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-kilo"
@@ -360,6 +362,7 @@ trusty-juno:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-juno"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index e3795792..3be7e824 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -34,12 +34,12 @@ openstack-phase2:
         monitor-count: 1
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
-        osd-reformat: 'yes'
+        osd-devices: ""
+#        osd-reformat: 'yes'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "nodes-compute=0"
+        - "lxc:nodes-api=0"
     ceph-osd:
       branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
       num_units: 1
@@ -47,7 +47,7 @@ openstack-phase2:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-api=0"
+        - "nodes-compute=0"
     ceph-radosgw:
       branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
       num_units: 1
@@ -258,6 +258,7 @@ trusty-liberty:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-liberty"
@@ -276,6 +277,7 @@ trusty-kilo:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-kilo"
@@ -294,6 +296,7 @@ trusty-juno:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-juno"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index c342d43d..75f3cafd 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -50,30 +50,28 @@ openstack-phase2:
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
+        osd-devices: ""
         monitor-count: 1
-        osd-reformat: 'no'
+#        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
+        - "lxc:nodes-api=0"
+    ceph-osd:
+      charm: cs:trusty/ceph-osd
+      num_units: 1
+      options:
+        osd-devices: /srv
+        osd-reformat: 'yes'
+      to:
         - "nodes-compute=0"
-#        - "nodes-compute=1"
-#    ceph-osd:
-#      charm: cs:trusty/ceph-osd
-#      num_units: 1
-#      options:
-#        osd-devices: /dev/sdb
-#        osd-reformat: 'yes'
-#      to:
-#        - "lxc:nodes-api=0"
-#    ceph-radosgw:
-#      charm: cs:trusty/ceph-radosgw
-#      num_units: 1
-#      options:
-#        use-embedded-webserver: true
-#      to:
-
-#        - "lxc:nodes-api=0"
+    ceph-radosgw:
+      charm: cs:trusty/ceph-radosgw
+      num_units: 1
+      options:
+        use-embedded-webserver: true
+      to:
+        - "lxc:nodes-api=0"
     cinder:
       branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 1
@@ -241,6 +239,12 @@ openstack-phase2:
       - "cinder-ceph:ceph"
     - - "ceph:client"
       - "glance:ceph"
+    - - "ceph-osd:mon"
+      - "ceph:osd"
+    - - "ceph-radosgw:mon"
+      - "ceph:radosgw"
+    - - "ceph-radosgw:identity-service"
+      - "keystone:identity-service"
 trusty-liberty-nodes:
   inherits: openstack-phase1
   overrides:
@@ -250,6 +254,7 @@ trusty-liberty:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-liberty"
@@ -271,6 +276,7 @@ trusty-kilo:
   overrides:
     region: Canonical
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     openstack-origin: cloud:trusty-kilo
     source: cloud:trusty-kilo
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 00ee8d2c..b46be986 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -86,26 +86,29 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     ceph:
       branch: lp:~openstack-charmers/charms/trusty/ceph/next
-      num_units: 2
+      num_units: 3
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
-        monitor-count: 1
-        osd-reformat: 'false'
+        osd-devices: ""
+        monitor-count: 3
+#        osd-reformat: 'false'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=2"
     ceph-osd:
       branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
-      num_units: 1
+      num_units: 2
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-api=1"
+        - "nodes-compute=0"
+        - "nodes-compute=1"
+#        - "nodes-api=0"
     ceph-radosgw:
       branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
       num_units: 1
@@ -348,6 +351,7 @@ trusty-liberty:
   overrides:
 #    cluster_count: 3
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-liberty"
@@ -367,6 +371,7 @@ trusty-kilo:
   overrides:
 #    cluster_count: 3
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-kilo"
@@ -386,6 +391,7 @@ trusty-juno:
   overrides:
 #    cluster_count: 3
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-juno"
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 7ee1e292..d4c398de 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -50,29 +50,28 @@ openstack-phase2:
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
+        osd-devices: ""
         monitor-count: 1        
-        osd-reformat: 'no'
+#        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
+        - "lxc:nodes-api=0"
+    ceph-osd:
+      charm: cs:trusty/ceph-osd
+      num_units: 1
+      options:
+        osd-devices: /srv
+        osd-reformat: 'yes'
+      to:
         - "nodes-compute=0"
-#        - "nodes-compute=1"
-#    ceph-osd:
-#      charm: cs:trusty/ceph-osd
-#      num_units: 1
-#      options:
-#        osd-devices: /dev/sdb
-#        osd-reformat: 'yes'
-#      to:
-#        - "lxc:nodes-api=0"
-#    ceph-radosgw:
-#      charm: cs:trusty/ceph-radosgw
-#      num_units: 1
-#      options:
-#        use-embedded-webserver: true
-#      to:
-#        - "lxc:nodes-api=0"
+    ceph-radosgw:
+      charm: cs:trusty/ceph-radosgw
+      num_units: 1
+      options:
+        use-embedded-webserver: true
+      to:
+        - "lxc:nodes-api=0"
     cinder:
       branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 1
@@ -152,7 +151,7 @@ openstack-phase2:
         http-proxy: "http://squid.internal:3128"
         https-proxy: "http://squid.internal:3128"
       to:
-        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
     "glance": 
       branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 1
@@ -255,6 +254,12 @@ openstack-phase2:
       - "cinder-ceph:ceph"
     - - "ceph:client"
       - "glance:ceph"
+    - - "ceph-osd:mon"
+      - "ceph:osd"
+    - - "ceph-radosgw:mon"
+      - "ceph:radosgw"
+    - - "ceph-radosgw:identity-service"
+      - "keystone:identity-service"
 trusty-liberty-nodes:
   inherits: openstack-phase1
   overrides:
@@ -264,6 +269,7 @@ trusty-liberty:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-liberty"
@@ -282,6 +288,7 @@ trusty-kilo:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-kilo"
@@ -300,6 +307,7 @@ trusty-juno:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-juno"
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index db41fd75..2d83b60d 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -50,30 +50,28 @@ openstack-phase2:
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
+        osd-devices: ""
         monitor-count: 1
-        osd-reformat: 'no'
+#        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
+        - "lxc:nodes-api=0"
+    ceph-osd:
+      charm: cs:trusty/ceph-osd
+      num_units: 1
+      options:
+        osd-devices: /srv
+        osd-reformat: 'yes'
+      to:
         - "nodes-compute=0"
-#        - "nodes-compute=1"
-#    ceph-osd:
-#      charm: cs:trusty/ceph-osd
-#      num_units: 1
-#      options:
-#        osd-devices: /dev/sdb
-#        osd-reformat: 'yes'
-#      to:
-#        - "lxc:nodes-api=0"
-#    ceph-radosgw:
-#      charm: cs:trusty/ceph-radosgw
-#      num_units: 1
-#      options:
-#        use-embedded-webserver: true
-#      to:
-
-#        - "lxc:nodes-api=0"
+    ceph-radosgw:
+      charm: cs:trusty/ceph-radosgw
+      num_units: 1
+      options:
+        use-embedded-webserver: true
+      to:
+        - "lxc:nodes-api=0"
     cinder:
       branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 1
@@ -259,6 +257,12 @@ openstack-phase2:
       - "cinder-ceph:ceph"
     - - "ceph:client"
       - "glance:ceph"
+    - - "ceph-osd:mon"
+      - "ceph:osd"
+    - - "ceph-radosgw:mon"
+      - "ceph:radosgw"
+    - - "ceph-radosgw:identity-service"
+      - "keystone:identity-service"
 trusty-liberty-nodes:
   inherits: openstack-phase1
   overrides:
@@ -268,6 +272,7 @@ trusty-liberty:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-liberty"
@@ -289,6 +294,7 @@ trusty-kilo:
   overrides:
     region: Canonical
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     openstack-origin: cloud:trusty-kilo
     source: cloud:trusty-kilo
diff --git a/docs/installation-instructions.rst b/docs/installation-instructions.rst
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/docs/installation-instructions.rst