projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding ImagePullPolicy config option to OSM Charms
[osm/devops.git]
/
installers
/
charm
/
lcm-k8s
/
reactive
/
lcm.py
diff --git
a/installers/charm/lcm-k8s/reactive/lcm.py
b/installers/charm/lcm-k8s/reactive/lcm.py
index
313ed63
..
87b6b2c
100644
(file)
--- a/
installers/charm/lcm-k8s/reactive/lcm.py
+++ b/
installers/charm/lcm-k8s/reactive/lcm.py
@@
-11,18
+11,20
@@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from charms.layer.caas_base import pod_spec_set
-from charms.reactive import endpoint_from_flag
-from charms.reactive import when, when_not, hook
-from charms.reactive.flags import set_flag, clear_flag
+import logging
+import yaml
+
from charmhelpers.core.hookenv import (
log,
metadata,
config,
)
from charms import layer
from charmhelpers.core.hookenv import (
log,
metadata,
config,
)
from charms import layer
-import yaml
-import logging
+from charms.layer.caas_base import pod_spec_set
+from charms.reactive import endpoint_from_flag
+from charms.reactive import when, when_not, hook
+from charms.reactive.flags import set_flag, clear_flag
+
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
@@
-136,7
+138,6
@@
def make_pod_spec(ro_host, ro_port, kafka_host, kafka_port, mongo_uri):
data = {
"name": md.get("name"),
data = {
"name": md.get("name"),
- "docker_image": cfg.get("image"),
"ro_host": ro_host,
"ro_port": ro_port,
"kafka_host": kafka_host,
"ro_host": ro_host,
"ro_port": ro_port,
"kafka_host": kafka_host,